Skip to content

Commit

Permalink
deathsquad nuke test passed
Browse files Browse the repository at this point in the history
  • Loading branch information
AloeNeverDie committed Jan 19, 2025
1 parent 1ccc35f commit c8954c7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
1 change: 0 additions & 1 deletion modular_bandastation/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#include "code/items/weapons/ranged/energy/awaymission_gun.dm"
#include "code/items/weapons/ranged/energy/eg_14.dm"

#include "code/machinery/nuclearbomb.dm"
#include "code/machinery/papershredder.dm"
#include "code/machinery/photocopier.dm"
#include "code/machinery/suit_storage_unit.dm"
Expand Down
4 changes: 0 additions & 4 deletions modular_bandastation/objects/code/machinery/nuclearbomb.dm

This file was deleted.

18 changes: 16 additions & 2 deletions modular_bandastation/outfits/code/centcom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,27 @@

// Death Squad

/datum/antagonist/ert/deathsquad/on_gain() // Give deathsquad nuke code when ERT is summoned
. = ..()
var/datum/objective/missionobj = new ()
var/nuke_code
var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in SSmachines.get_machines_by_type(/obj/machinery/nuclearbomb/selfdestruct)
nuke_code = random_nukecode()
if(nuke.r_code == NUKE_CODE_UNSET)
nuke.r_code = nuke_code
else //Already set by admins/something else?
nuke_code = nuke.r_code
missionobj.owner = owner
missionobj.explanation_text = "Запустите механизм самоуничтожения на [station_name()], коды активации: [nuke.r_code]"
missionobj.completed = TRUE
objectives |= missionobj

/datum/outfit/centcom/death_commando/officer
name = "Death Commando Officer"
backpack_contents = list(
/obj/item/ammo_box/a357 = 1,
/obj/item/flashlight = 1,
/obj/item/grenade/c4/x4 = 1,
/obj/item/storage/box/flashbangs = 1,
/obj/item/storage/medkit/regular = 1,
/obj/item/obj/item/disk/nuclear
/obj/item/disk/nuclear
)

0 comments on commit c8954c7

Please sign in to comment.