Skip to content

Commit

Permalink
Merge branch 'master' into gun-safety-psa
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gristlebee
Gristlebee authored Aug 29, 2024
2 parents b6aafd3 + 5d7af6f commit 870f136
Show file tree
Hide file tree
Showing 191 changed files with 1,494 additions and 3,835 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@
/obj/item/toy/plush/moth/firewatch,
/obj/item/toy/plush/lizardplushie,
/obj/item/toy/plush/knight,
/obj/item/toy/prize/mauler,
/obj/item/toy/prize/touro,
/obj/item/toy/talking/AI,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
Expand Down
151 changes: 70 additions & 81 deletions _maps/shuttles/independent/independent_box.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@
dir = 9
},
/obj/structure/catwalk/over,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
Expand All @@ -261,9 +258,8 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/meter/atmos/layer2,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/plating,
/area/ship/engineering)
"bk" = (
Expand Down Expand Up @@ -324,6 +320,11 @@
dir = 1
},
/obj/effect/decal/cleanable/wrapping,
/obj/machinery/light_switch{
pixel_x = 19;
pixel_y = 13;
dir = 8
},
/turf/open/floor/plating,
/area/ship/engineering)
"bo" = (
Expand Down Expand Up @@ -620,12 +621,11 @@
/turf/open/floor/carpet/nanoweave/blue,
/area/ship/bridge)
"cr" = (
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
/obj/structure/cable{
icon_state = "6-8"
/obj/machinery/iv_drip/saline,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plating,
/area/ship/engineering)
"cu" = (
Expand Down Expand Up @@ -1497,6 +1497,10 @@
dir = 8
},
/obj/structure/catwalk/over,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/ship/engineering)
"ql" = (
Expand All @@ -1520,27 +1524,24 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 1
},
/obj/structure/cable{
icon_state = "5-9"
},
/obj/structure/sign/warning/electricshock{
pixel_x = 32
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
/turf/open/floor/plating,
/area/ship/engineering)
"qX" = (
/turf/open/floor/plasteel/white,
/area/ship/medical)
"ri" = (
/obj/structure/railing{
dir = 8
},
/obj/machinery/iv_drip/saline,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/railing{
dir = 4
/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
dir = 1
},
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plating,
/area/ship/engineering)
"ro" = (
Expand Down Expand Up @@ -1619,11 +1620,11 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable/yellow{
icon_state = "2-5"
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/turf/open/floor/plating,
/area/ship/engineering)
Expand Down Expand Up @@ -1836,13 +1837,10 @@
/turf/open/floor/plating,
/area/ship/bridge)
"wb" = (
/obj/machinery/power/port_gen/pacman{
anchored = 1
},
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/power/port_gen/pacman,
/obj/item/wrench,
/obj/structure/cable/yellow,
/obj/machinery/airalarm/directional/south,
/obj/structure/cable,
/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plating,
/area/ship/engineering)
"wd" = (
Expand Down Expand Up @@ -1871,10 +1869,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
},
/obj/structure/catwalk/over,
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/catwalk/over,
/obj/structure/cable{
icon_state = "2-8"
},
/turf/open/floor/plating,
/area/ship/engineering)
"wj" = (
Expand Down Expand Up @@ -2200,21 +2201,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew)
"CR" = (
/obj/structure/railing{
dir = 4
},
/obj/machinery/atmospherics/pipe/layer_manifold/visible{
dir = 8
},
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/item/storage/bag/trash{
pixel_x = 6
/obj/machinery/power/smes/engineering{
charge = 1e+006
},
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plating,
/area/ship/engineering)
"Dm" = (
Expand Down Expand Up @@ -2302,18 +2293,16 @@
/turf/open/floor/plasteel/white,
/area/ship/cargo)
"FL" = (
/obj/machinery/firealarm/directional/south,
/obj/structure/catwalk/over,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/meter/atmos/layer2,
/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
dir = 4
},
/obj/machinery/light_switch{
dir = 1;
pixel_x = 10;
pixel_y = -19
/obj/machinery/power/terminal{
dir = 8
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/catwalk/over,
/turf/open/floor/plating,
/area/ship/engineering)
"Gb" = (
Expand All @@ -2326,10 +2315,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/wallframe/firealarm,
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 4
},
/obj/machinery/firealarm/directional/west,
/turf/open/floor/plating,
/area/ship/engineering)
"Gi" = (
Expand Down Expand Up @@ -2372,24 +2361,10 @@
/turf/open/floor/plating,
/area/ship/engineering)
"HM" = (
/obj/machinery/power/terminal{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "0-10"
},
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/rack,
/obj/item/areaeditor/shuttle,
/obj/item/flashlight{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical{
pixel_y = 4
/obj/structure/catwalk/over,
/obj/machinery/atmospherics/components/binary/pump/layer2{
dir = 8
},
/obj/item/bot_assembly/hygienebot,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plating,
/area/ship/engineering)
"Ic" = (
Expand All @@ -2412,12 +2387,11 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/medical)
"In" = (
/obj/machinery/power/smes/engineering{
charge = 1e+006
},
/obj/structure/cable{
icon_state = "0-10"
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 8;
piping_layer = 2
},
/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plating,
/area/ship/engineering)
"Ja" = (
Expand Down Expand Up @@ -2704,7 +2678,6 @@
/obj/structure/railing{
dir = 4
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plating,
/area/ship/engineering)
"SJ" = (
Expand Down Expand Up @@ -2832,10 +2805,20 @@
/turf/open/floor/plating,
/area/ship/bridge)
"WW" = (
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 4
/obj/structure/cable/yellow{
icon_state = "0-10"
},
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/structure/rack,
/obj/item/areaeditor/shuttle,
/obj/item/flashlight{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/toolbox/mechanical{
pixel_y = 4
},
/obj/item/bot_assembly/hygienebot,
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
/area/ship/engineering)
Expand Down Expand Up @@ -2963,9 +2946,15 @@
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"ZN" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/item/storage/bag/trash{
pixel_x = 6
},
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/machinery/light/small/directional/east,
/obj/structure/salvageable/machine,
/turf/open/floor/plating,
/area/ship/engineering)

Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/solgov/solgov_chronicle.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
/obj/item/door_remote/captain,
/obj/item/storage/belt/sabre/solgov,
/obj/item/clothing/under/solgov/dress,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain,
/obj/item/clothing/suit/armor/vest/solgov/captain,
/obj/item/stamp/solgov,
/obj/item/clothing/suit/armor/solgov_trenchcoat,
/obj/item/spacecash/bundle/loadsamoney,
Expand Down Expand Up @@ -955,7 +955,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor{
dir = 1
},
Expand Down Expand Up @@ -4105,7 +4105,7 @@
/area/ship/crew/office)
"OU" = (
/obj/item/clothing/neck/cloak/overseer,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer,
/obj/item/clothing/suit/armor/vest/solgov/overseer,
/obj/structure/closet/secure_closet/head_of_personnel{
anchored = 1;
name = "\proper overseer's locker";
Expand Down
14 changes: 7 additions & 7 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -308,7 +308,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -1526,9 +1526,9 @@
/obj/structure/closet/cabinet{
name = "armor cabinet"
},
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/head/solgov/sonnensoldner,
/obj/item/clothing/head/solgov/sonnensoldner,
/obj/item/clothing/head/solgov/sonnensoldner,
Expand Down Expand Up @@ -3647,7 +3647,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/turf/open/floor/plasteel/white,
Expand Down Expand Up @@ -5839,7 +5839,7 @@
/area/ship/cargo)
"LB" = (
/obj/item/clothing/head/solgov/captain,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain,
/obj/item/clothing/suit/armor/vest/solgov/captain,
/obj/item/clothing/under/solgov/formal/captain,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/gloves/combat,
Expand Down
Loading

0 comments on commit 870f136

Please sign in to comment.