Skip to content

Commit

Permalink
TEG Supply Crate + More (#1714)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
DexeeXI authored Apr 22, 2024
1 parent d94769d commit d0fe15b
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 9 deletions.
3 changes: 3 additions & 0 deletions _maps/RandomRuins/SpaceRuins/russian_derelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
36 changes: 30 additions & 6 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -96851,7 +96875,7 @@ vCp
qgq
cqR
uKf
uKf
xOL
ddT
sIG
uKf
Expand Down Expand Up @@ -102629,7 +102653,7 @@ mDv
uGA
tqT
iiE
bCy
jsu
mDv
ksa
ksa
Expand Down
18 changes: 15 additions & 3 deletions monkestation/code/modules/cargo/crates/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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?"
Expand Down Expand Up @@ -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."
Expand All @@ -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."
Expand All @@ -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

0 comments on commit d0fe15b

Please sign in to comment.