From 3afabd7dd0449b9c422149a439be0116576910c2 Mon Sep 17 00:00:00 2001 From: KromeAngel Date: Tue, 11 Apr 2023 03:57:46 +0200 Subject: [PATCH 1/5] Departmental budget cards --- .../structures/crates_lockers/closets/secure/cargo.dm | 3 +++ .../crates_lockers/closets/secure/engineering.dm | 3 +++ .../crates_lockers/closets/secure/medical.dm | 3 +++ .../crates_lockers/closets/secure/scientist.dm | 3 +++ .../crates_lockers/closets/secure/security.dm | 11 +++++++++++ tgstation.dme | 5 +++++ 6 files changed, 28 insertions(+) create mode 100644 modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm create mode 100644 modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm create mode 100644 modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/medical.dm create mode 100644 modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm create mode 100644 modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/security.dm diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm new file mode 100644 index 0000000000..175ae48c2c --- /dev/null +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -0,0 +1,3 @@ +/obj/structure/closet/secure_closet/quartermaster/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/car(src) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm new file mode 100644 index 0000000000..7e441e447d --- /dev/null +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -0,0 +1,3 @@ +/obj/structure/closet/secure_closet/engineering_chief/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/eng(src) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/medical.dm new file mode 100644 index 0000000000..e45506e8b7 --- /dev/null +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -0,0 +1,3 @@ +/obj/structure/closet/secure_closet/CMO/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/med(src) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm new file mode 100644 index 0000000000..711c6aa0ef --- /dev/null +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -0,0 +1,3 @@ +/obj/structure/closet/secure_closet/RD/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/sci(src) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/security.dm new file mode 100644 index 0000000000..c5c679e1fd --- /dev/null +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -0,0 +1,11 @@ +/obj/structure/closet/secure_closet/captains/PopulateContents() //Excess clothing and such can be found in the Captain's Wardrobe. You can also find this file in code/modules/vending/wardrobes. + ..() + new /obj/item/card/id/departmental_budget/civ(src) + +/obj/structure/closet/secure_closet/hop/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/srv(src) + +/obj/structure/closet/secure_closet/hos/PopulateContents() + ..() + new /obj/item/card/id/departmental_budget/sec(src) diff --git a/tgstation.dme b/tgstation.dme index 2432c3d64a..ae6ee0b8c8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3906,4 +3906,9 @@ #include "modular_lumos\code\modules\tgs\chat_commands.dm" #include "modular_lumos\code\modules\tgs\custom_procs.dm" #include "modular_lumos\code\game\machinery\recycler.dm" +#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\cargo.dm" +#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" +#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\medical.dm" +#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" +#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\security.dm" // END_INCLUDE From 7a94545a5f9b4ddc7bfd15d66668f634f0bbddcb Mon Sep 17 00:00:00 2001 From: KromeAngel <56308151+KromeAngel@users.noreply.github.com> Date: Wed, 19 Apr 2023 05:35:21 +0200 Subject: [PATCH 2/5] Update engineering.dm --- .../structures/crates_lockers/closets/secure/engineering.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index c5081c0dd9..546c5a3979 100644 --- a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -2,4 +2,4 @@ ..() new /obj/item/card/id/departmental_budget/eng(src) new /obj/item/pipe_dispenser/bluespace(src) - \ No newline at end of file + From e74ad40ab6aba03024f5af211336b380c0658277 Mon Sep 17 00:00:00 2001 From: KromeAngel <56308151+KromeAngel@users.noreply.github.com> Date: Wed, 19 Apr 2023 23:46:29 +0200 Subject: [PATCH 3/5] Update engineering.dm From 915b333264e98ea96fadd6ed4af29bc8c39d76c7 Mon Sep 17 00:00:00 2001 From: KromeAngel <56308151+KromeAngel@users.noreply.github.com> Date: Wed, 19 Apr 2023 23:51:30 +0200 Subject: [PATCH 4/5] Update engineering.dm --- .../structures/crates_lockers/closets/secure/engineering.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 546c5a3979..82ac98d063 100644 --- a/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/modular_lumos/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -2,4 +2,3 @@ ..() new /obj/item/card/id/departmental_budget/eng(src) new /obj/item/pipe_dispenser/bluespace(src) - From fc08b8d75e38325b69cbab1e7e8d407bfeb84502 Mon Sep 17 00:00:00 2001 From: KromeAngel <56308151+KromeAngel@users.noreply.github.com> Date: Thu, 20 Apr 2023 05:30:10 +0200 Subject: [PATCH 5/5] Hopefully this fixes it. --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index d306e5ee2b..dc340b984d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3920,7 +3920,6 @@ #include "modular_lumos\code\game\objects\items\stacks\tiles\tile_titanium.dm" #include "modular_lumos\code\game\objects\items\stacks\tiles\tile_types.dm" #include "modular_lumos\code\game\objects\items\stacks\tiles\tile_wooden.dm" -#include "modular_lumos\code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" #include "modular_lumos\code\game\turfs\simulated\floor\base_icon_state_overrides.dm" #include "modular_lumos\code\game\turfs\simulated\floor\misc_floor.dm" #include "modular_lumos\code\game\turfs\simulated\floor\plasteel_floor.dm"