Skip to content

Commit

Permalink
Merge branch 'master' into hardsuits
Browse files Browse the repository at this point in the history
  • Loading branch information
@SmiLeYre
SmiLeYre authored Jul 6, 2024
2 parents eda9dc5 + 61f41ab commit 912f9e5
Show file tree
Hide file tree
Showing 1,503 changed files with 77,456 additions and 65,851 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,7 @@
"pQ" = (
/obj/machinery/cell_charger_multi,
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 9
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/obj/item/circuitboard/machine/space_heater,
/obj/item/stack/cable_coil/five,
/obj/structure/frame/machine,
/obj/item/stock_parts/cell/super,
/obj/item/stock_parts/power_store/cell/super,
/turf/open/floor/wood,
/area/ruin/smoking_room/house)
"d" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell,
/obj/item/stock_parts/power_store/cell,
/turf/open/floor/plating,
/area/ruin/plasma_facility/operations)
"bv" = (
Expand Down Expand Up @@ -166,7 +166,7 @@
pixel_x = -7;
pixel_y = 8
},
/obj/item/stock_parts/cell/high{
/obj/item/stock_parts/power_store/cell/high{
pixel_x = -18;
pixel_y = -3
},
Expand Down
16 changes: 4 additions & 12 deletions _maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/turf/open/floor/plating/snowed{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/turf/open/floor/plating/snowed/standard_air,
/area/ruin/comms_agent)
"uk" = (
/obj/structure/cable,
Expand Down Expand Up @@ -761,9 +759,7 @@
/obj/structure/cable,
/obj/item/cultivator/rake,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating/snowed{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/turf/open/floor/plating/snowed/standard_air,
/area/ruin/comms_agent)
"Ll" = (
/obj/effect/mapping_helpers/broken_floor,
Expand Down Expand Up @@ -867,9 +863,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/turf/open/floor/plating/snowed{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/turf/open/floor/plating/snowed/standard_air,
/area/ruin/comms_agent)
"NJ" = (
/obj/item/storage/medkit/regular,
Expand All @@ -892,9 +886,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/snowed{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
},
/turf/open/floor/plating/snowed/standard_air,
/area/ruin/comms_agent)
"OB" = (
/turf/open/lava/plasma/ice_moon,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4475,10 +4475,10 @@
pixel_y = 7;
light_color = "#adadcd"
},
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/effect/turf_decal/tile/dark/full,
/turf/open/floor/iron/dark/textured_large,
/area/ruin/syndicate_lava_base/testlab)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,7 @@
},
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/syndicate_lava_base/cargo)
Expand Down Expand Up @@ -2081,7 +2081,7 @@
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5508,10 +5508,10 @@
pixel_y = 7;
light_color = "#adadcd"
},
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/item/stock_parts/power_store/cell/bluespace,
/obj/effect/turf_decal/tile/dark/full,
/turf/open/floor/iron/dark/textured_large,
/area/ruin/syndicate_lava_base/testlab)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"l" = (
/obj/item/stock_parts/cell,
/obj/item/stock_parts/power_store/cell,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"m" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/allamericandiner.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@
"yE" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/power/terminal{
dir = 4
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
"aI" = (
/obj/structure/closet/crate/engineering/electrical,
/obj/item/storage/toolbox/electrical,
/obj/item/stock_parts/cell/hyper,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/power_store/cell/hyper,
/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/mineral/titanium/yellow,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aJ" = (
Expand Down Expand Up @@ -207,7 +207,7 @@
"aW" = (
/obj/structure/closet/crate/engineering/electrical,
/obj/item/storage/toolbox/electrical,
/obj/item/stock_parts/cell/hyper,
/obj/item/stock_parts/power_store/cell/hyper,
/turf/open/floor/mineral/titanium/yellow,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aX" = (
Expand All @@ -233,7 +233,7 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bc" = (
/obj/structure/table,
/obj/item/stock_parts/cell/hyper,
/obj/item/stock_parts/power_store/cell/hyper,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/crashedship.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@
dir = 1
},
/obj/structure/table,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/crashedship/aft)
"XW" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
/turf/template_noop,
/area/space)
"s" = (
/obj/item/stock_parts/cell/high/empty,
/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/misc/asteroid/airless,
/area/space)
"u" = (
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
"Fz" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"FL" = (
Expand Down Expand Up @@ -1069,11 +1069,11 @@
pixel_y = 8
},
/obj/machinery/light/warm,
/obj/machinery/power/apc/auto_name/directional/south{
cell_type = /obj/item/stock_parts/cell/lead
/obj/machinery/power/apc{
locked = 0;
pixel_y = -25;
start_charge = 0
},
/obj/effect/mapping_helpers/apc/no_charge,
/obj/effect/mapping_helpers/apc/unlocked,
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"vf" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"vM" = (
Expand Down Expand Up @@ -536,11 +536,11 @@
pixel_y = 8
},
/obj/machinery/light/warm,
/obj/machinery/power/apc/auto_name/directional/south{
cell_type = /obj/item/stock_parts/cell/lead
/obj/machinery/power/apc{
locked = 0;
pixel_y = -25;
start_charge = 0
},
/obj/effect/mapping_helpers/apc/no_charge,
/obj/effect/mapping_helpers/apc/unlocked,
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
Expand Down
16 changes: 8 additions & 8 deletions _maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"kb" = (
/obj/effect/decal/cleanable/fuel_pool,
/obj/item/stock_parts/cell/crap/empty,
/obj/item/stock_parts/power_store/cell/crap/empty,
/obj/effect/decal/cleanable/plastic,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/dumpsterair,
Expand Down Expand Up @@ -447,7 +447,7 @@
/obj/structure/broken_flooring/pile,
/obj/item/food/deadmouse/moldy,
/obj/item/stock_parts/water_recycler,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"vW" = (
Expand All @@ -469,11 +469,11 @@
pixel_y = 8
},
/obj/machinery/light/warm,
/obj/machinery/power/apc/auto_name/directional/south{
cell_type = /obj/item/stock_parts/cell/lead
/obj/machinery/power/apc{
locked = 0;
pixel_y = -25;
start_charge = 0
},
/obj/effect/mapping_helpers/apc/no_charge,
/obj/effect/mapping_helpers/apc/unlocked,
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron,
/area/ruin/space/has_grav/garbagetruck/squat)
Expand Down Expand Up @@ -668,7 +668,7 @@
"HN" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/squat)
"HZ" = (
Expand Down Expand Up @@ -754,7 +754,7 @@
/turf/open/space/basic,
/area/ruin/space/has_grav/garbagetruck/squat)
"MQ" = (
/obj/item/stock_parts/cell/crap/empty{
/obj/item/stock_parts/power_store/cell/crap/empty{
pixel_x = -4;
pixel_y = 10
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,11 +652,11 @@
pixel_y = 8
},
/obj/machinery/light/warm,
/obj/machinery/power/apc/auto_name/directional/south{
cell_type = /obj/item/stock_parts/cell/lead
/obj/machinery/power/apc{
locked = 0;
pixel_y = -25;
start_charge = 0
},
/obj/effect/mapping_helpers/apc/no_charge,
/obj/effect/mapping_helpers/apc/unlocked,
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron,
/area/ruin/space/has_grav/garbagetruck/toystore)
Expand All @@ -671,7 +671,7 @@
"Mp" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/lead,
/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/toystore)
"MK" = (
Expand Down Expand Up @@ -757,7 +757,7 @@
/area/ruin/space/has_grav/garbagetruck/toystore)
"Rl" = (
/obj/item/paper/crumpled,
/obj/item/stock_parts/cell/hyper,
/obj/item/stock_parts/power_store/cell/hyper,
/obj/item/hand_labeler,
/obj/item/hand_labeler_refill,
/obj/item/hand_labeler_refill,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,7 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Sn" = (
/obj/structure/table/wood,
/obj/item/stock_parts/cell/bluespace{
/obj/item/stock_parts/power_store/cell/bluespace{
pixel_y = 4
},
/obj/machinery/cell_charger{
Expand Down
Loading

0 comments on commit 912f9e5

Please sign in to comment.