From 989abbe32bd76dca5b77ea713d6ca1b34e938dbd Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:19:15 -0700 Subject: [PATCH 1/2] bullshitpowercreep --- .../objects/items/storage/boxes/job_boxes.dm | 7 ++- .../modular_items/icons/oxygen_candle.dmi | Bin 0 -> 817 bytes .../modular_items/oxygen_candle.dm | 44 ++++++++++++++++++ tgstation.dme | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 modular_doppler/modular_items/icons/oxygen_candle.dmi create mode 100644 modular_doppler/modular_items/oxygen_candle.dm diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm index a8ced4fdad48e..a7c6551034719 100644 --- a/code/game/objects/items/storage/boxes/job_boxes.dm +++ b/code/game/objects/items/storage/boxes/job_boxes.dm @@ -17,7 +17,7 @@ /obj/item/storage/box/survival/Initialize(mapload) . = ..() - if(crafted || !HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS)) + if(crafted) //DOPPLER EDIT CHANGE - ORIGINAL: if(crafted || !HAS_TRAIT(SSstation, STATION_TRAIT_PREMIUM_INTERNALS)) return atom_storage.max_slots += 2 atom_storage.max_total_storage += 4 @@ -46,6 +46,11 @@ if(length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1) new /obj/item/climbing_hook/emergency(src) + //DOPPLER EDIT ADDITION + new /obj/item/oxygen_candle(src) + new /obj/item/grenade/chem_grenade/smart_metal_foam + //DOPPLER EDIT END + /obj/item/storage/box/survival/radio/PopulateContents() ..() // we want the survival stuff too. new /obj/item/radio/off(src) diff --git a/modular_doppler/modular_items/icons/oxygen_candle.dmi b/modular_doppler/modular_items/icons/oxygen_candle.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5654fbd9d2f494fa9b6e6a03b1e96f88dc2ea215 GIT binary patch literal 817 zcmV-11J3-3P)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+zoIfZF)t-2Rf&r; zC9|j)C}zmTnO2mTn+joLs*F!6Ey~NxOUJIm0w|iAlUNB7)oJFbSnRzMrj4i?C z3}ppZKNqkM0i9<P%;NcfTyX>b7mHi&G4lywA= ztgn7Tz7n9WM-7;N7K{aWpldL+Q7~avP#ugw}G)=3YPK^HqgM< zF9rL)!v?l~Em%kcQ~y=4lLm(Vc}3sk3hn$L&-uBc6BzqJ=I65R-~`70_>W1|LCm`ReaS}!EnkB>ytqNv4+P*H@X-d?&+P<&FvAH&i_eIV3;ka-E-%2opDy_k%m-}qzt0DJKH&2KpAYzaz~=)lm+N0h z`+i>!p#F)0QYpc3YA)^T?OOnbUV--gx*mY!_s;-~dj>JI{67#NGJyJp#_$`>JKy*7 z`!UbQVMlQ0_x|q#j^pR&FeKpl{;0Bh2&95pW&Hpm200000NkvXXu0mjf$O3{2 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_items/oxygen_candle.dm b/modular_doppler/modular_items/oxygen_candle.dm new file mode 100644 index 0000000000000..fdfee3e7a6683 --- /dev/null +++ b/modular_doppler/modular_items/oxygen_candle.dm @@ -0,0 +1,44 @@ +#define OXY_CANDLE_RELEASE_TEMP (T20C + 10) // 30 celsius, it's hot. Will be even hotter with hotspot expose + +/obj/item/oxygen_candle + name = "oxygen candle" + desc = "A steel tube with the words 'OXYGEN - PULL CORD TO IGNITE' stamped on the side.\nA small label reads 'WARNING: NOT FOR LIGHTING USE. WILL IGNITE FLAMMABLE GASSES'" + icon = 'modular_doppler/modular_items/icons/oxygen_candle.dmi' + icon_state = "oxycandle" + w_class = WEIGHT_CLASS_SMALL + light_color = LIGHT_COLOR_LAVA // Very warm chemical burn + var/pulled = FALSE + var/processing = FALSE + var/processes_left = 40 + +/obj/item/oxygen_candle/attack_self(mob/user) + if(!pulled) + playsound(src, 'sound/effects/fuse.ogg', 75, 1) + balloon_alert(user, "cord pulled") + icon_state = "oxycandle_burning" + pulled = TRUE + processing = TRUE + START_PROCESSING(SSobj, src) + set_light(2) + +/obj/item/oxygen_candle/process() + var/turf/pos = get_turf(src) + if(!pos) + return + pos.hotspot_expose(500, 100) + pos.atmos_spawn_air("o2=5;TEMP=[OXY_CANDLE_RELEASE_TEMP]") + processes_left-- + if(processes_left <= 0) + set_light(0) + STOP_PROCESSING(SSobj, src) + processing = FALSE + name = "burnt oxygen candle" + icon_state = "oxycandle_burnt" + desc += "\nThis tube has exhausted its chemicals." + +/obj/item/oxygen_candle/Destroy() + if(processing) + STOP_PROCESSING(SSobj, src) + return ..() + +#undef OXY_CANDLE_RELEASE_TEMP diff --git a/tgstation.dme b/tgstation.dme index 2b1b2bee5ac89..51a3878b89b99 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6969,6 +6969,7 @@ #include "modular_doppler\modular_items\bettermed_overrides.dm" #include "modular_doppler\modular_items\conversion_kits.dm" #include "modular_doppler\modular_items\invisible_gear.dm" +#include "modular_doppler\modular_items\oxygen_candle.dm" #include "modular_doppler\modular_items\shipchem_overrides.dm" #include "modular_doppler\modular_items\hairbrush\code\hairbrush.dm" #include "modular_doppler\modular_items\hyposprays\code\autolathe_designs.dm" From 4ae112e0f03d11883801136fdb65344165a71d7c Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 21:31:55 -0700 Subject: [PATCH 2/2] less powercreep --- .../objects/items/storage/boxes/job_boxes.dm | 2 +- ..._candle.dm => emergency_breach_equipment.dm} | 17 +++++++++++++++++ tgstation.dme | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) rename modular_doppler/modular_items/{oxygen_candle.dm => emergency_breach_equipment.dm} (64%) diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm index a7c6551034719..6ff9643702cb3 100644 --- a/code/game/objects/items/storage/boxes/job_boxes.dm +++ b/code/game/objects/items/storage/boxes/job_boxes.dm @@ -48,7 +48,7 @@ //DOPPLER EDIT ADDITION new /obj/item/oxygen_candle(src) - new /obj/item/grenade/chem_grenade/smart_metal_foam + new /obj/item/grenade/chem_grenade/budget_smart_metal(src) //DOPPLER EDIT END /obj/item/storage/box/survival/radio/PopulateContents() diff --git a/modular_doppler/modular_items/oxygen_candle.dm b/modular_doppler/modular_items/emergency_breach_equipment.dm similarity index 64% rename from modular_doppler/modular_items/oxygen_candle.dm rename to modular_doppler/modular_items/emergency_breach_equipment.dm index fdfee3e7a6683..d718728949ccf 100644 --- a/modular_doppler/modular_items/oxygen_candle.dm +++ b/modular_doppler/modular_items/emergency_breach_equipment.dm @@ -42,3 +42,20 @@ return ..() #undef OXY_CANDLE_RELEASE_TEMP + +/obj/item/grenade/chem_grenade/budget_smart_metal + name = "budget smart metal foam grenade" + desc = "Used for emergency sealing of hull breaches, while keeping areas accessible. This one came in a bulk pack a few years ago, and some of the ingredients have gone flat." + stage = GRENADE_READY + +/obj/item/grenade/chem_grenade/budget_smart_metal/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) + + beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 50) + beaker_two.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 15) + beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 15) + + beakers += beaker_one + beakers += beaker_two diff --git a/tgstation.dme b/tgstation.dme index 51a3878b89b99..124c66c3b9561 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6968,8 +6968,8 @@ #include "modular_doppler\modular_items\aac_device.dm" #include "modular_doppler\modular_items\bettermed_overrides.dm" #include "modular_doppler\modular_items\conversion_kits.dm" +#include "modular_doppler\modular_items\emergency_breach_equipment.dm" #include "modular_doppler\modular_items\invisible_gear.dm" -#include "modular_doppler\modular_items\oxygen_candle.dm" #include "modular_doppler\modular_items\shipchem_overrides.dm" #include "modular_doppler\modular_items\hairbrush\code\hairbrush.dm" #include "modular_doppler\modular_items\hyposprays\code\autolathe_designs.dm"