From 9bfa59355b9c7567f083f54c013427897f70def8 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 17 Jul 2022 09:10:25 +1000 Subject: [PATCH 1/3] Adds double engi closets for SD and RP --- .../closets/secure/engineering.dm | 15 ++++++- maps/groundbase/gb-z1.dmm | 45 ++++++++++--------- maps/stellar_delight/stellar_delight2.dmm | 39 +++++++++------- vorestation.dme | 2 +- 4 files changed, 60 insertions(+), 41 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 1f1aaf0bd17..1c60a1b5c52 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -54,6 +54,12 @@ /obj/item/weapon/module/power_control = 3, /obj/item/device/multitool = 3) +/obj/structure/closet/secure_closet/engineering_electrical/double + starts_with = list( + /obj/item/clothing/gloves/yellow = 4, + /obj/item/weapon/storage/toolbox/electrical = 6, + /obj/item/weapon/module/power_control = 6, + /obj/item/device/multitool = 6) /obj/structure/closet/secure_closet/engineering_welding name = "welding supplies" @@ -66,6 +72,13 @@ /obj/item/weapon/weldpack = 3, /obj/item/clothing/glasses/welding = 3) +/obj/structure/closet/secure_closet/engineering_welding/double + starts_with = list( + /obj/item/clothing/head/welding = 6, + /obj/item/weapon/weldingtool/largetank = 6, + /obj/item/weapon/weldpack = 6, + /obj/item/clothing/glasses/welding = 6) + /obj/structure/closet/secure_closet/engineering_personal name = "engineer's locker" req_access = list(access_engine_equip) @@ -119,7 +132,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos, /obj/item/clothing/shoes/boots/winter/atmos, /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? + /obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? /obj/structure/closet/secure_closet/atmos_personal/Initialize() if(prob(50)) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 12300fddc78..e9766264258 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -586,6 +586,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/westspur) +"bw" = ( +/obj/structure/closet/toolcloset, +/obj/item/weapon/pickaxe, +/obj/item/weapon/chainsaw, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/workshop) "bx" = ( /obj/structure/table/reinforced, /obj/item/device/floor_painter, @@ -642,6 +648,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/security/processing) +"bD" = ( +/obj/structure/closet/secure_closet/engineering_electrical/double, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/workshop) "bE" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -680,6 +692,14 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"bH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/structure/closet/secure_closet/engineering_welding/double, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/workshop) "bJ" = ( /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/eastspur) @@ -1842,11 +1862,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) -"ez" = ( -/obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/workshop) "eA" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3114,14 +3129,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) -"hS" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/workshop) "hT" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -13116,12 +13123,6 @@ }, /turf/simulated/floor/tiled, /area/holodeck_control) -"FW" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/workshop) "FX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_security/polarized{ @@ -35209,14 +35210,14 @@ pe Wl VC XJ -ez +bw zv NY ER jf BH -FW -hS +bD +bH JM ph aE diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 6787baf4c59..2e060a99d55 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -1919,6 +1919,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck2/o2production) +"dW" = ( +/obj/structure/closet/secure_closet/engineering_electrical/double{ + anchored = 1 + }, +/turf/simulated/floor/tiled/eris/dark/orangecorner, +/area/engineering/locker_room) "dX" = ( /obj/machinery/light{ dir = 8 @@ -2071,6 +2077,10 @@ }, /turf/simulated/open, /area/stellardelight/deck2/aftstarboard) +"eo" = ( +/obj/structure/closet/secure_closet/engineering_welding/double, +/turf/simulated/floor/tiled/eris/dark/orangecorner, +/area/engineering/locker_room) "ep" = ( /obj/machinery/power/apc/angled{ dir = 4; @@ -2481,6 +2491,10 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) +"fj" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/simulated/floor/tiled/techfloor, +/area/stellardelight/deck2/o2production) "fk" = ( /obj/machinery/vending/engivend, /obj/machinery/light{ @@ -2534,6 +2548,10 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +"fq" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/simulated/floor/tiled/techfloor, +/area/stellardelight/deck2/o2production) "fr" = ( /obj/structure/sign/painting/public{ pixel_x = -30 @@ -7093,12 +7111,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"pF" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/turf/simulated/floor/tiled/eris/dark/orangecorner, -/area/engineering/locker_room) "pG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7910,9 +7922,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) -"ro" = ( -/turf/simulated/floor/tiled/techfloor, -/area/stellardelight/deck2/o2production) "rp" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -18294,10 +18303,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) -"OB" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/simulated/floor/tiled/eris/dark/orangecorner, -/area/engineering/locker_room) "OC" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -30186,7 +30191,7 @@ UY OK pO Qu -ro +fj Sz ZG Jh @@ -30328,7 +30333,7 @@ pY DE sT WM -ro +fq Sz QW Jh @@ -35564,7 +35569,7 @@ Re OI da iw -pF +dW To To Vo @@ -35708,7 +35713,7 @@ Kv dS vb Nm -OB +eo OF Oq rf diff --git a/vorestation.dme b/vorestation.dme index 746f044cb95..488059591c8 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4139,6 +4139,7 @@ #include "maps\expedition_vr\beach\submaps\mountains.dm" #include "maps\expedition_vr\beach\submaps\mountains_areas.dm" #include "maps\gateway_archive_vr\blackmarketpackers.dm" +#include "maps\groundbase\groundbase.dm" #include "maps\offmap_vr\om_ships\abductor.dm" #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" @@ -4146,7 +4147,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" From b40711bc39bdb9cb7bc0cf9011f0410308397e48 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 17 Jul 2022 09:23:35 +1000 Subject: [PATCH 2/3] Initialize chainsaw --- code/game/objects/items/weapons/material/chainsaw.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 74fb9681e00..f64b41d7f0b 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -12,13 +12,13 @@ var/active_force = 55 var/inactive_force = 10 -/obj/item/weapon/chainsaw/New() +/obj/item/weapon/chainsaw/Initialize() var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src R.add_reagent("fuel", max_fuel) START_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/weapon/chainsaw/Destroy() STOP_PROCESSING(SSobj, src) From c2b432d6964b9558e1e50021f6cc345c06c63f7a Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 17 Jul 2022 12:08:15 +1000 Subject: [PATCH 3/3] Also fixes holofloors being used in locker room --- maps/stellar_delight/stellar_delight2.dmm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 2e060a99d55..6b6601dda94 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -2147,7 +2147,7 @@ }, /obj/item/clothing/shoes/black, /obj/item/device/communicator, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "ew" = ( /obj/structure/table/steel_reinforced, @@ -3598,7 +3598,7 @@ /obj/machinery/disposal/wall/cleaner{ dir = 4 }, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "hQ" = ( /obj/structure/table/standard, @@ -5634,7 +5634,7 @@ /obj/machinery/vending/loadout/loadout_misc, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/landmark/vines, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "me" = ( /obj/structure/cable/white{ @@ -5865,7 +5865,7 @@ /obj/item/clothing/shoes/black, /obj/machinery/light, /obj/item/device/communicator, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "mH" = ( /obj/structure/table/steel_reinforced, @@ -10651,7 +10651,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "xJ" = ( /obj/structure/table/reinforced, @@ -11718,7 +11718,7 @@ }, /obj/machinery/vending/loadout/uniform, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "Af" = ( /obj/structure/table/reinforced, @@ -12917,7 +12917,7 @@ }, /obj/machinery/vending/loadout/clothing, /obj/machinery/alarm/angled, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "CW" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -13106,7 +13106,7 @@ }, /obj/structure/undies_wardrobe, /obj/effect/landmark/vermin, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "Dv" = ( /obj/structure/cable/white{ @@ -14300,7 +14300,7 @@ }, /obj/machinery/vending/loadout/overwear, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "FS" = ( /obj/structure/cable/green{ @@ -15274,7 +15274,7 @@ /area/engineering/storage) "HV" = ( /obj/machinery/washing_machine, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "HW" = ( /obj/machinery/door/firedoor/glass, @@ -21572,7 +21572,7 @@ dir = 8 }, /obj/machinery/vending/loadout/gadget, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "VV" = ( /obj/structure/cable/orange{