From 259e24b06233bb063045b202a49692bb1704dbcd Mon Sep 17 00:00:00 2001 From: Aylong Date: Sun, 10 Mar 2024 07:13:51 +0200 Subject: [PATCH 1/3] add: 2 Jaunter Grandes for Paramedic --- modular_ss220/balance/code/items/storage/surgical_tray.dm | 7 +++++++ modular_ss220/objects/code/closets.dm | 1 + 2 files changed, 8 insertions(+) diff --git a/modular_ss220/balance/code/items/storage/surgical_tray.dm b/modular_ss220/balance/code/items/storage/surgical_tray.dm index c3c65d4b0692..2b0582e2648a 100644 --- a/modular_ss220/balance/code/items/storage/surgical_tray.dm +++ b/modular_ss220/balance/code/items/storage/surgical_tray.dm @@ -1,3 +1,4 @@ +// Surgical Tray /obj/item/storage/surgical_tray/Initialize(mapload) . = ..() @@ -12,3 +13,9 @@ new /obj/item/circular_saw(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) + +// Paramedic Closet +/obj/structure/closet/secure_closet/paramedic/populate_contents() + . = ..() + new /obj/item/grenade/jaunter_grenade(src) + new /obj/item/grenade/jaunter_grenade(src) diff --git a/modular_ss220/objects/code/closets.dm b/modular_ss220/objects/code/closets.dm index afaa0de02099..d0d648d43726 100644 --- a/modular_ss220/objects/code/closets.dm +++ b/modular_ss220/objects/code/closets.dm @@ -15,3 +15,4 @@ . = ..() new /obj/item/melee/baton/electrostaff/loaded(src) new /obj/item/screwdriver(src) + From 16bf1b5d427b7c461475b1587d0dfc05a5c09de5 Mon Sep 17 00:00:00 2001 From: Aylong Date: Sun, 10 Mar 2024 14:57:07 +0200 Subject: [PATCH 2/3] Transfer --- modular_ss220/balance/_balance.dme | 1 + modular_ss220/balance/code/items/storage/closets.dm | 5 +++++ modular_ss220/balance/code/items/storage/surgical_tray.dm | 7 ------- 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 modular_ss220/balance/code/items/storage/closets.dm diff --git a/modular_ss220/balance/_balance.dme b/modular_ss220/balance/_balance.dme index f6734c169e84..b01ea0dfc302 100644 --- a/modular_ss220/balance/_balance.dme +++ b/modular_ss220/balance/_balance.dme @@ -4,6 +4,7 @@ #include "code/items/projectiles.dm" #include "code/items/weapons.dm" #include "code/items/storage/surgical_tray.dm" +#include "code/items/storage/closets.dm" #include "code/jobs/warden.dm" #include "code/mobs/aliens/larva.dm" #include "code/species/machine.dm" diff --git a/modular_ss220/balance/code/items/storage/closets.dm b/modular_ss220/balance/code/items/storage/closets.dm new file mode 100644 index 000000000000..08393304616c --- /dev/null +++ b/modular_ss220/balance/code/items/storage/closets.dm @@ -0,0 +1,5 @@ +// Paramedic Closet +/obj/structure/closet/secure_closet/paramedic/populate_contents() + . = ..() + new /obj/item/grenade/jaunter_grenade(src) + new /obj/item/grenade/jaunter_grenade(src) diff --git a/modular_ss220/balance/code/items/storage/surgical_tray.dm b/modular_ss220/balance/code/items/storage/surgical_tray.dm index 2b0582e2648a..c3c65d4b0692 100644 --- a/modular_ss220/balance/code/items/storage/surgical_tray.dm +++ b/modular_ss220/balance/code/items/storage/surgical_tray.dm @@ -1,4 +1,3 @@ -// Surgical Tray /obj/item/storage/surgical_tray/Initialize(mapload) . = ..() @@ -13,9 +12,3 @@ new /obj/item/circular_saw(src) new /obj/item/bonegel(src) new /obj/item/bonesetter(src) - -// Paramedic Closet -/obj/structure/closet/secure_closet/paramedic/populate_contents() - . = ..() - new /obj/item/grenade/jaunter_grenade(src) - new /obj/item/grenade/jaunter_grenade(src) From 26fed90ce22145642c239f4b8b4615aecf89ed56 Mon Sep 17 00:00:00 2001 From: Aylong Date: Sun, 10 Mar 2024 15:01:02 +0200 Subject: [PATCH 3/3] Transfer 2 --- modular_ss220/balance/code/items/storage/closets.dm | 6 ++++++ modular_ss220/objects/code/closets.dm | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_ss220/balance/code/items/storage/closets.dm b/modular_ss220/balance/code/items/storage/closets.dm index 08393304616c..ce635fffc864 100644 --- a/modular_ss220/balance/code/items/storage/closets.dm +++ b/modular_ss220/balance/code/items/storage/closets.dm @@ -3,3 +3,9 @@ . = ..() new /obj/item/grenade/jaunter_grenade(src) new /obj/item/grenade/jaunter_grenade(src) + +// Blueshield Closet +/obj/structure/closet/secure_closet/blueshield/populate_contents() + . = ..() + new /obj/item/melee/baton/electrostaff/loaded(src) + new /obj/item/screwdriver(src) diff --git a/modular_ss220/objects/code/closets.dm b/modular_ss220/objects/code/closets.dm index d0d648d43726..12c36417138c 100644 --- a/modular_ss220/objects/code/closets.dm +++ b/modular_ss220/objects/code/closets.dm @@ -10,9 +10,3 @@ new /obj/item/gun/energy/laser/awaymission_aeg/rnd(src) new /obj/item/storage/firstaid/regular(src) new /obj/item/paper/pamphlet/gateway(src) - -/obj/structure/closet/secure_closet/blueshield/populate_contents() - . = ..() - new /obj/item/melee/baton/electrostaff/loaded(src) - new /obj/item/screwdriver(src) -