From d0fe15be5e4a039950231e47e3b8b7d6cb4244cd Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 22 Apr 2024 15:17:37 -0600 Subject: [PATCH] TEG Supply Crate + More (#1714) * refix refix * slasher disable per last meeting, slasher disabled til halloween. * crates improvement comments out what we arent using, adds an option to buy the TEG boards if everything is turbofucked. * box tweaks added skirts to the prison laundry room. added a fire alarm for the transfer room. added a lapvend near sci on the central ring. no good spot in/next to sci to stick. added mechcomp vendor for engies in maints between engine and atmos. * russian derelict fix fix issue #1056 --- .../SpaceRuins/russian_derelict.dmm | 3 ++ _maps/map_files/BoxStation/BoxStation.dmm | 36 +++++++++++++++---- .../code/modules/cargo/crates/engineering.dm | 18 ++++++++-- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm index 6096c3196ad3..9e99f0ba85f7 100644 --- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm @@ -7919,6 +7919,9 @@ /obj/item/stack/sheet/mineral/gold{ amount = 50 }, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, /turf/open/floor/iron/airless, /area/ruin/space/ks13/ai/vault) "WO" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 21946b9200d9..2f5e9148ffeb 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -21851,6 +21851,7 @@ dir = 1 }, /obj/structure/sign/poster/official/random/directional/north, +/obj/machinery/lapvend, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "hux" = ( @@ -27580,6 +27581,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"jsu" = ( +/obj/machinery/vending/mechcomp, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "jsw" = ( /obj/machinery/camera/directional/east{ c_tag = "Security - Visitation Observation"; @@ -28433,15 +28438,27 @@ /area/station/hallway/primary/fore) "jHa" = ( /obj/structure/closet/crate/trashcart/laundry, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, /obj/machinery/firealarm/directional/south, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, /turf/open/floor/iron/dark, /area/station/security/prison/shower) "jHh" = ( @@ -69616,6 +69633,13 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/aft) +"xOL" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "xOV" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -96851,7 +96875,7 @@ vCp qgq cqR uKf -uKf +xOL ddT sIG uKf @@ -102629,7 +102653,7 @@ mDv uGA tqT iiE -bCy +jsu mDv ksa ksa diff --git a/monkestation/code/modules/cargo/crates/engineering.dm b/monkestation/code/modules/cargo/crates/engineering.dm index 1c84eec442ac..40417918dee1 100644 --- a/monkestation/code/modules/cargo/crates/engineering.dm +++ b/monkestation/code/modules/cargo/crates/engineering.dm @@ -13,6 +13,7 @@ contains = list(/obj/item/clothing/head/cone = 6) crate_name = "engineering hat crate" +/* // Commented out to remove from cargo orders as no maps in rotation require this. This will remain until it is changed. -Dexee 4/21/24 /datum/supply_pack/engineering/stompers name = "Hotspot Stomping Kit" desc = "Everything you need to stomp hotspots." @@ -26,7 +27,7 @@ cost = CARGO_CRATE_VALUE * 10 contains = list(/obj/item/vent_package = 5) crate_name = "engineering vent crate" - +*/ /datum/supply_pack/engineering/servicefab name = "Service Techfab Replacement" desc = "You're telling me botany broke it with a lemon?" @@ -112,7 +113,7 @@ ) crate_name = "Replacement Science Protolathe" crate_type = /obj/structure/closet/crate/secure/engineering - +/* /datum/supply_pack/engineering/trench_explorer name = "Trench Explorer Kit" desc = "A pack of 5 ladders and breaching charges to explore the pit." @@ -122,7 +123,7 @@ /obj/item/trench_ladder_kit = 5 ) crate_name = "engineering vent crate" - +*/ /datum/supply_pack/engine/am_jar name = "Antimatter Containment Jar Crate" desc = "Two Antimatter containment jars stuffed into a single crate." @@ -143,3 +144,14 @@ cost = CARGO_CRATE_VALUE * 9 contains = list(/obj/item/am_shielding_container = 9) crate_name = "antimatter shielding crate" + +// TEG Crate for when it works! +/datum/supply_pack/engine/teg + name = "Thermoelectric Generator Crate" + desc = "Contains machine boards to construct a functional thermoelectric generator system. Some assembly required. At least it includes an RPD!" + cost = CARGO_CRATE_VALUE * 12 + contains = list(/obj/item/circuitboard/machine/thermoelectric_generator, + /obj/item/circuitboard/machine/circulator = 2, + /obj/item/pipe_dispenser) + crate_name = "Thermoelectric Generator Crate" + crate_type = /obj/structure/closet/crate/secure/engineering