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.

Sign up for GitHub

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

[FIX] Fix for a runtime error in deathsquad.dm #28012

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
+5 −8
Open

[FIX] Fix for a runtime error in deathsquad.dm #28012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0d237ef
Admins can change AI laws in Death Squad spawn event
Drsmail Dec 17, 2024
2dd1110
Refactored some text
Drsmail Dec 17, 2024
8e442e1
Adds ERT coms to an ai and cyborgs
Drsmail Dec 19, 2024
190a682
Spelling
Drsmail Dec 29, 2024
4fdd300
high-importance style text on laws update
Drsmail Jan 6, 2025
01c63f4
Merge branch 'master' into Deathsquad_ai_laws
Drsmail Jan 6, 2025
c94afed
Merge branch 'Deathsquad_ai_laws' of https://github.com/Drsmail/Parad…
Drsmail Jan 6, 2025
b36696d
Laws uppdate + sound
Drsmail Jan 6, 2025
f13db32
Update sound to much much bette one, made by dj-34
Drsmail Jan 9, 2025
4f52b11
Merge branch 'master' into Deathsquad_ai_laws
lewcc Jan 10, 2025
50f217a
Removed old comment
Drsmail Jan 11, 2025
75f910d
Merge branch 'master' into Deathsquad_ai_laws
Drsmail Jan 11, 2025
17dbf6e
Fix cyborg radio and refactor how ai gets his
Drsmail Jan 17, 2025
16ce5b3
Fix cyborg radio and refactor how ai gets his
Drsmail Jan 17, 2025
604d020
Merge branch 'Deathsquad_ai_laws' of https://github.com/Drsmail/Parad…
Drsmail Jan 17, 2025
be10e4c
Merge branch 'master' into Deathsquad_ai_laws
Drsmail Jan 17, 2025
1486674
Removed empty lines
Drsmail Jan 17, 2025
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
5 changes: 0 additions & 5 deletions code/game/objects/items/devices/radio/headset.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,3 @@
keyslot1 = new /obj/item/encryptionkey/syndicate
syndiekey = keyslot1
recalculateChannels()

/obj/item/radio/headset/proc/make_epsilon() // Turns AI's and cyborgs radio to Epsilon radio!
qdel(keyslot1)
keyslot1 = new /obj/item/encryptionkey/centcom
recalculateChannels()
8 changes: 5 additions & 3 deletions code/modules/admin/verbs/deathsquad.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,17 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE)
SEND_SOUND(AI, notice_sound)
AI.show_laws()
var/obj/item/radio/headset/heads/ai_integrated/ai_radio = AI.get_radio()
ai_radio.make_epsilon()
ai_radio.channels |= list("Response Team" = 1, "Special Ops" = 1)
ai_radio.config(ai_radio.channels)

for(var/mob/living/silicon/robot/R in AI.connected_robots)
R.sync()
to_chat(R, "<span class='userdanger'>Central command has uploaded a new set of laws you must follow. Make sure you follow them.</span>")
SEND_SOUND(R, notice_sound)
R.show_laws()
var/obj/item/radio/headset/heads/ai_integrated/cyberg_radio = R.get_radio()
cyberg_radio.make_epsilon()
var/obj/item/radio/borg/cyberg_radio = R.get_radio()
cyberg_radio.channels |= list("Response Team" = 1, "Special Ops" = 1)
cyberg_radio.config(cyberg_radio.channels)
Comment on lines +51 to +53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var/obj/item/radio/borg/cyberg_radio = R.get_radio()
cyberg_radio.channels |= list("Response Team" = 1, "Special Ops" = 1)
cyberg_radio.config(cyberg_radio.channels)
var/obj/item/radio/borg/cyborg_radio = R.get_radio()
cyborg_radio.channels |= list("Response Team" = 1, "Special Ops" = 1)
cyborg_radio.config(cyborg_radio.channels)

Just a small typo


// Locates commandos spawns
var/list/commando_spawn_locations = list()
Expand Down
Loading