From 20df2e6eebfee65dbb0363f360f2cc5e83cfd6f3 Mon Sep 17 00:00:00 2001 From: Darius <5933805+LeDrascol@users.noreply.github.com> Date: Sat, 24 Dec 2022 18:17:14 -0500 Subject: [PATCH] Prevent holodeck griefing Replaces plasma flood, holo-carp, and killer bees. The modules will now create harmless air, corgis, and foxes. --- code/__SPLURTCODE/DEFINES/atmospherics.dm | 4 ++++ modular_splurt/code/game/area/areas/holodeck.dm | 11 +++++++++++ modular_splurt/code/modules/holodeck/holo_effect.dm | 7 +++++++ tgstation.dme | 2 ++ 4 files changed, 24 insertions(+) create mode 100644 modular_splurt/code/game/area/areas/holodeck.dm create mode 100644 modular_splurt/code/modules/holodeck/holo_effect.dm diff --git a/code/__SPLURTCODE/DEFINES/atmospherics.dm b/code/__SPLURTCODE/DEFINES/atmospherics.dm index 3aeb99ee08..f73f8d8ceb 100644 --- a/code/__SPLURTCODE/DEFINES/atmospherics.dm +++ b/code/__SPLURTCODE/DEFINES/atmospherics.dm @@ -1,2 +1,6 @@ // Gas defines here because somebody hates typepaths #define GAS_COPIUM "copium" + +// Prevent holodeck plasma +#undef BURNMIX_ATMOS +#define BURNMIX_ATMOS OPENTURF_DEFAULT_ATMOS diff --git a/modular_splurt/code/game/area/areas/holodeck.dm b/modular_splurt/code/game/area/areas/holodeck.dm new file mode 100644 index 0000000000..0403c86a39 --- /dev/null +++ b/modular_splurt/code/game/area/areas/holodeck.dm @@ -0,0 +1,11 @@ +// Replacement for holodeck plasma module +/area/holodeck/rec_center/burn + name = "Holodeck - Atmospheric Test" + +// Replacement for holodeck carp module +/area/holodeck/rec_center/wildlife + name = "Holodeck - Good Boy Simulation" + +// Replacement for holodeck bee module +/area/holodeck/rec_center/anthophila + name = "Holodeck - Gekkerphila" diff --git a/modular_splurt/code/modules/holodeck/holo_effect.dm b/modular_splurt/code/modules/holodeck/holo_effect.dm new file mode 100644 index 0000000000..6d362bc9fb --- /dev/null +++ b/modular_splurt/code/modules/holodeck/holo_effect.dm @@ -0,0 +1,7 @@ +// Replace carp with corgis +/obj/effect/holodeck_effect/mobspawner + mobtype = /mob/living/simple_animal/pet/dog/corgi + +// Replace bees with foxes +/obj/effect/holodeck_effect/mobspawner/bee + mobtype = /mob/living/simple_animal/pet/fox diff --git a/tgstation.dme b/tgstation.dme index a4a2548fee..b58a6bd6e1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4338,6 +4338,7 @@ #include "modular_splurt\code\game\say.dm" #include "modular_splurt\code\game\area\areas\centcom.dm" #include "modular_splurt\code\game\area\areas\commons.dm" +#include "modular_splurt\code\game\area\areas\holodeck.dm" #include "modular_splurt\code\game\area\areas\layenia.dm" #include "modular_splurt\code\game\area\areas\maintenance.dm" #include "modular_splurt\code\game\area\areas\shuttles.dm" @@ -4595,6 +4596,7 @@ #include "modular_splurt\code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" #include "modular_splurt\code\modules\holiday\holidays.dm" +#include "modular_splurt\code\modules\holodeck\holo_effect.dm" #include "modular_splurt\code\modules\hydroponics\grown\towercap.dm" #include "modular_splurt\code\modules\jobs\job_types\_job_alt_titles.dm" #include "modular_splurt\code\modules\jobs\job_types\atmospheric_technician.dm"