Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #243

Merged
merged 40 commits into from
May 1, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b76c141
Automatic changelog compile [ci skip]
actions-user Apr 30, 2024
2d7c027
Fixes broken malf AI APC hacking NO-GBP (#82962)
Metekillot Apr 30, 2024
bc4e7d3
Remove data systems in favor of global datums (#82943)
Mothblocks Apr 30, 2024
4bf208a
trainship hijack deathmatch map (#82933)
mc-oofert Apr 30, 2024
039f625
Automatic changelog for PR #82933 [ci skip]
comfyorange Apr 30, 2024
1873d21
Fix laser_pointer/inifity_range having the wrong diode (#82940)
larentoun Apr 30, 2024
ff22a70
Automatic changelog for PR #82940 [ci skip]
comfyorange Apr 30, 2024
a8d5a8d
node drones hard deletes (#82927)
Ben10Omintrix Apr 30, 2024
ba26aff
RCD upgrades have names and icon states (#82734)
lessthnthree Apr 30, 2024
b23ec90
Automatic changelog for PR #82734 [ci skip]
comfyorange Apr 30, 2024
3ad2318
[gbp no update] fix: ethereal alt attack verb is "sear" (#82951)
13spacemen Apr 30, 2024
bbbac79
Fixes DNA sequence scanner showing mutated genes (#82949)
JohnFulpWillard Apr 30, 2024
c555931
Automatic changelog for PR #82951 [ci skip]
comfyorange Apr 30, 2024
28bd50f
Automatic changelog for PR #82949 [ci skip]
comfyorange Apr 30, 2024
3dd846f
Fixes syndicate infiltrator having "weak spots" (#82959)
improvedname Apr 30, 2024
2612ebf
Fixes missing wires in tramstation, and fixes name of cmo shutters on…
improvedname Apr 30, 2024
907c107
Fixes computers deconstructing themselves twice (#82956)
SyncIt21 Apr 30, 2024
921f330
Adds a notice to PDAs that their batteries can be removed (#82937)
Maurukas Apr 30, 2024
b60dad7
Automatic changelog for PR #82955 [ci skip]
comfyorange Apr 30, 2024
50c2e01
Automatic changelog for PR #82956 [ci skip]
comfyorange Apr 30, 2024
0d28e00
Bumps Hypnagogic to v3.1.0 (#82953)
LemonInTheDark Apr 30, 2024
f60f939
Automatic changelog for PR #82937 [ci skip]
comfyorange Apr 30, 2024
8267489
A birdshot atmos improvement, and fixes the engineering microwave. (#…
Constellado Apr 30, 2024
fa55e2f
QM is excluded from command-excluded objectives (#82941)
JohnFulpWillard Apr 30, 2024
b51e1d4
Automatic changelog for PR #82924 [ci skip]
comfyorange Apr 30, 2024
f407c49
Automatic changelog for PR #82941 [ci skip]
comfyorange Apr 30, 2024
46354b0
[no gbp] Fixes deathmatch observers (#82931)
jlsnow301 Apr 30, 2024
40e1de5
Automatic changelog for PR #82931 [ci skip]
comfyorange Apr 30, 2024
e4fe394
Unique Heretic Ascension Announcements (#82878)
Absolucy Apr 30, 2024
bac2a39
Automatic changelog for PR #82878 [ci skip]
comfyorange Apr 30, 2024
3b807fc
you can use a photo with blueprints on it to read wires (#82873)
Fikou Apr 30, 2024
af2afaa
Automatic changelog for PR #82873 [ci skip]
comfyorange Apr 30, 2024
6291396
Converts `GLOB.CHARGELEVEL` into a local APC define (#82957)
SyncIt21 Apr 30, 2024
04680dc
Catlike Grace works with Freerunning (#82823)
necromanceranne Apr 30, 2024
892de14
Automatic changelog for PR #82823 [ci skip]
comfyorange Apr 30, 2024
17dcabf
Human AI camera consoles can now be repackaged (#82629)
JohnFulpWillard Apr 30, 2024
45657b1
Automatic changelog for PR #82629 [ci skip]
comfyorange Apr 30, 2024
f5595a1
Automatic changelog compile [ci skip]
actions-user May 1, 2024
dccd6da
Changeling clothes can now be removed by monkeys (#82966)
JohnFulpWillard May 1, 2024
6ca5c80
Automatic changelog for PR #82966 [ci skip]
comfyorange May 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Human AI camera consoles can now be repackaged (tgstation#82629)
## About The Pull Request

Human AI's advanced camera console currently uses the base console which
has no circuit, meaning it's impossible to unscrew it. Instead of giving
it their own circuit, I thought it would be better to rework it into
something that gets packed and unpacked, similar to the bible w/ Altar
of the Gods.
I thought this would be the best way to handle it in case the human AI
wants to move their board over, while still keeping that limit of
remaining in the AI sat, and making it still make sense (if it was a
board, there's no reason for it to NOT work outside of the SAT).

## Why It's Good For The Game

The advanced camera console can be moved without compromise on the
intended restrictions.

## Changelog

:cl:
qol: The Human AI's advanced security console can be repackaged with a
screwdriver if you wish to move it.
/:cl:

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
JohnFulpWillard and MrMelbert authored Apr 30, 2024
commit 17dcabfed5ba421d2bf3125264a11bae76963ead
9 changes: 9 additions & 0 deletions code/game/machinery/computer/camera_advanced.dm
Original file line number Diff line number Diff line change
@@ -339,3 +339,12 @@
to_chat(owner, span_notice("You move downwards."))
else
to_chat(owner, span_notice("You couldn't move downwards!"))

/obj/machinery/computer/camera_advanced/human_ai/screwdriver_act(mob/living/user, obj/item/tool)
balloon_alert(user, "repackaging...")
if(!do_after(user, 5 SECONDS, src))
return ITEM_INTERACT_BLOCKING
tool.play_tool_sound(src, 40)
new /obj/item/secure_camera_console_pod(get_turf(src))
qdel(src)
return ITEM_INTERACT_SUCCESS
14 changes: 7 additions & 7 deletions code/modules/jobs/job_types/station_trait/human_ai.dm
Original file line number Diff line number Diff line change
@@ -148,8 +148,8 @@
return ..()

/obj/item/secure_camera_console_pod
name = "advanced camera control pod"
desc = "Calls down a secure camera console to use for all your AI stuff, may only be activated in the SAT."
name = "pre-packaged advanced camera control"
desc = "A pre-packaged camera console used for all your AI stuff, programmed to only active in the SAT."
icon = 'icons/obj/devices/remote.dmi'
icon_state = "botpad_controller"
inhand_icon_state = "radio"
@@ -163,9 +163,9 @@
if(!is_type_in_typecache(current_area, allowed_areas))
user.balloon_alert(user, "not in the sat!")
return
podspawn(list(
"target" = get_turf(src),
"style" = STYLE_BLUESPACE,
"spawn" = /obj/machinery/computer/camera_advanced,
))
user.balloon_alert(user, "unpacking...")
if(!do_after(user, 5 SECONDS, src))
return
playsound(src, 'sound/items/drill_use.ogg', 40, TRUE)
new /obj/machinery/computer/camera_advanced/human_ai(get_turf(src))
qdel(src)