From 605175a89c4559792685b5544a90429b20b7006a Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Sat, 18 Jan 2025 00:03:55 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=BB=D0=B8=D1=87=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=B0=D1=83=D1=82=D1=84=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D0=B2,=20=D0=BD=D1=8E=D0=BA=D0=B0=20=D1=82=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=B5=D1=82=20=D0=BA=D0=BE=D0=B4=20=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B8=20##=20=D0=A7=D1=82?= =?UTF-8?q?=D0=BE=20=D1=8D=D1=82=D0=BE=D1=82=20PR=20=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Сейчас у нюк бомбы вообще не генерятся коды и статический r_flag = admin, исправляет это недоразумение; Переделка различных аутифтов, в основном связанных с ЦК и щитспавном. ПР в драфте пока не закончу ## Почему это хорошо для игры У всего вида ядерных бомб теперь всегда рандомится код, и теперь у дедов при спане будет код от неё; У дедов теперь будет диск от нюки (Почему его не бьло раньше??????); Различные исправления и добавления в щитспавн аутфиты потому что потому. ## Тестирование Локалка ## Changelog :cl: tweak: Различные исправления в аутфитах fix: У нюки теперь всегда есть код /:cl: --- modular_bandastation/objects/_objects.dme | 1 + modular_bandastation/objects/code/machinery/nuclearbomb.dm | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 modular_bandastation/objects/code/machinery/nuclearbomb.dm diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index 18878b6106faa..d0a8b3a11c776 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -51,6 +51,7 @@ #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" diff --git a/modular_bandastation/objects/code/machinery/nuclearbomb.dm b/modular_bandastation/objects/code/machinery/nuclearbomb.dm new file mode 100644 index 0000000000000..4126890811621 --- /dev/null +++ b/modular_bandastation/objects/code/machinery/nuclearbomb.dm @@ -0,0 +1,4 @@ +// MARK: Nuclear bombs now randomize their code +/obj/machinery/nuclearbomb/Initialize(mapload) + .= ..() + r_code = rand(0, 99999) From 1ccc35fb0785f4e6310a71af126db2b59e7549d3 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Sun, 19 Jan 2025 15:05:28 +0300 Subject: [PATCH 2/3] disk and omnidoor --- modular_bandastation/outfits/code/centcom.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/modular_bandastation/outfits/code/centcom.dm b/modular_bandastation/outfits/code/centcom.dm index 6d673ad2dd4f2..10307951f14b1 100644 --- a/modular_bandastation/outfits/code/centcom.dm +++ b/modular_bandastation/outfits/code/centcom.dm @@ -12,7 +12,8 @@ backpack_contents = list( /obj/item/storage/box/survival/centcom, /obj/item/ammo_box/a357 = 3, - /obj/item/storage/fancy/cigarettes/cigars + /obj/item/storage/fancy/cigarettes/cigars, + /obj/item/door_remote/omni ) belt = /obj/item/gun/ballistic/revolver/mateba ears = /obj/item/radio/headset/headset_cent/commander @@ -65,6 +66,7 @@ backpack_contents = list( /obj/item/storage/box/survival/centcom, /obj/item/stamp/centcom, + /obj/item/door_remote/omni ) belt = /obj/item/gun/energy/pulse/pistol/m1911 ears = /obj/item/radio/headset/headset_cent/commander @@ -144,3 +146,16 @@ /datum/id_trim/centcom/diplomat/New() . = ..() access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING) | (SSid_access.get_region_access_list(list(REGION_ALL_STATION)) - ACCESS_CHANGE_IDS) + +// Death Squad + +/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 + ) From c8954c72f7008c6e751acb9393686564750b9498 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Mon, 20 Jan 2025 02:11:23 +0300 Subject: [PATCH 3/3] deathsquad nuke test passed --- modular_bandastation/objects/_objects.dme | 1 - .../objects/code/machinery/nuclearbomb.dm | 4 ---- modular_bandastation/outfits/code/centcom.dm | 18 ++++++++++++++++-- 3 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 modular_bandastation/objects/code/machinery/nuclearbomb.dm diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index d0a8b3a11c776..18878b6106faa 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -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" diff --git a/modular_bandastation/objects/code/machinery/nuclearbomb.dm b/modular_bandastation/objects/code/machinery/nuclearbomb.dm deleted file mode 100644 index 4126890811621..0000000000000 --- a/modular_bandastation/objects/code/machinery/nuclearbomb.dm +++ /dev/null @@ -1,4 +0,0 @@ -// MARK: Nuclear bombs now randomize their code -/obj/machinery/nuclearbomb/Initialize(mapload) - .= ..() - r_code = rand(0, 99999) diff --git a/modular_bandastation/outfits/code/centcom.dm b/modular_bandastation/outfits/code/centcom.dm index 10307951f14b1..dbceb4cb62926 100644 --- a/modular_bandastation/outfits/code/centcom.dm +++ b/modular_bandastation/outfits/code/centcom.dm @@ -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 )