Skip to content

Commit

Permalink
Apply changes from upstream
Browse files Browse the repository at this point in the history
Adds roundstart autolathes to engineering

Adds NCT offices on our maps

Fix procedure mapping_helper icon colors

Purge redudant non-helper accesses

Adds missing icons

More convert stuff

More neck slot converts

Reallymad converts stethoscope

Convert missing neck slot clothing

Clean up spawners

Convert some accessories, mantles, etc to neck slot

Replace Hampter spawner

Apply updatepaths script
  • Loading branch information
dj-34 authored and m-dzianishchyts committed Jan 4, 2025
1 parent 39257cc commit 48fd5f1
Show file tree
Hide file tree
Showing 27 changed files with 1,125 additions and 796 deletions.
18 changes: 9 additions & 9 deletions _maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
/area/ruin/space/spacehotelv1/cargostorage)
"de" = (
/obj/structure/rack,
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/dirt/often,
/obj/structure/sign/poster/random{
pixel_x = -32
Expand Down Expand Up @@ -2409,7 +2409,7 @@
/obj/effect/spawner/random/cobweb/left/rare,
/obj/effect/spawner/random/dirt/often,
/obj/structure/rack,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
Expand Down Expand Up @@ -2911,7 +2911,7 @@
/area/ruin/space/spacehotelv1/guestroom4)
"wK" = (
/obj/structure/rack,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -3783,8 +3783,8 @@
/area/ruin/space/spacehotelv1/kitchen)
"Dx" = (
/obj/structure/rack,
/obj/random/toolbox,
/obj/random/tool,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"Dy" = (
Expand Down Expand Up @@ -4362,7 +4362,7 @@
/obj/structure/sign/vacuum{
pixel_x = 32
},
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/forestarboardmaints)
Expand Down Expand Up @@ -4470,7 +4470,7 @@
/area/ruin/space/spacehotelv1/forehallway)
"IB" = (
/obj/structure/rack,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -5441,8 +5441,8 @@
/area/ruin/space/spacehotelv1/restoraunt2)
"PO" = (
/obj/structure/rack,
/obj/random/toolbox,
/obj/random/tool,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3432,7 +3432,7 @@
},
/area/ruin/unpowered/syndicate_space_base/storage)
"uy" = (
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
Expand Down Expand Up @@ -7943,7 +7943,7 @@
/obj/item/storage/belt/medical,
/obj/item/crowbar,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@
/obj/machinery/atmospherics/unary/passive_vent{
dir = 1
},
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/item/flashlight/pen,
/obj/item/food/grown/apple{
desc = "An apple a day - keeps doctor away...";
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomZLevels/beach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3092,7 +3092,7 @@
pixel_x = -4
},
/obj/structure/table/glass,
/obj/item/clothing/accessory/stethoscope{
/obj/item/clothing/neck/stethoscope{
pixel_y = 4;
pixel_x = 4
},
Expand Down
22 changes: 10 additions & 12 deletions _maps/map_files220/RandomZLevels/caves.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3704,7 +3704,7 @@
/turf/simulated/floor/wood/lavaland_air,
/area/awaymission/caves)
"tK" = (
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaymission/caves)
"tL" = (
Expand Down Expand Up @@ -6777,8 +6777,8 @@
/area/awaymission/caves)
"Ku" = (
/obj/structure/table,
/obj/random/toolbox,
/obj/random/tool,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/plating,
/area/awaymission/caves/build/reqpower_build)
"Kw" = (
Expand Down Expand Up @@ -6807,7 +6807,7 @@
/area/awaymission/caves/build/reqpower_build)
"Kz" = (
/obj/structure/table,
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/awaymission/caves/build/reqpower_build)
Expand Down Expand Up @@ -7038,7 +7038,7 @@
/area/awaymission/caves)
"LJ" = (
/obj/structure/table,
/obj/item/gun/projectile/revolver/russian,
/obj/item/toy/russian_revolver,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/wood/oak,
/area/awaymission/caves/build/reqpower_build)
Expand Down Expand Up @@ -7573,10 +7573,8 @@
/area/awaymission/caves/build/reqpower_build)
"Po" = (
/obj/structure/table,
/obj/random/toolbox,
/obj/random/toolbox{
pixel_y = 8
},
/obj/effect/spawner/random/engineering/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/turf/simulated/floor/plasteel,
/area/awaymission/caves/build)
"Pp" = (
Expand Down Expand Up @@ -7752,7 +7750,7 @@
/area/awaymission/caves)
"Qm" = (
/obj/structure/table_frame,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -8379,7 +8377,7 @@
/obj/structure/closet/crate/wooden,
/obj/item/kitchen/knife/ritual,
/obj/item/staff/broom,
/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace,
/obj/item/clothing/accessory/locket/fluff/fethasnecklace,
/obj/effect/spawner/random/dirt/often,
/obj/item/salvage/ruin/tablet,
/turf/simulated/floor/wood/lavaland_air,
Expand Down Expand Up @@ -8805,7 +8803,7 @@
"VP" = (
/obj/item/clothing/glasses/night,
/obj/structure/closet,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/item/storage/toolbox/emergency,
/turf/simulated/floor/plasteel,
/area/awaymission/caves/build)
Expand Down
48 changes: 24 additions & 24 deletions _maps/map_files220/RandomZLevels/gate_lizard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
pixel_x = 16;
pixel_y = -9
},
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/machinery/door_control/shutter/west{
id = "CMDgate";
req_access = list(301)
Expand Down Expand Up @@ -535,10 +535,10 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside/waterfall)
"aOn" = (
/obj/item/clothing/accessory/necklace/skullcodpiece,
/obj/item/clothing/accessory/necklace/talisman,
/obj/item/clothing/accessory/necklace/skullcodpiece,
/obj/item/clothing/accessory/necklace/talisman,
/obj/item/clothing/accessory/skullcodpiece,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/skullcodpiece,
/obj/item/clothing/accessory/talisman,
/obj/structure/closet/crate/wooden,
/turf/simulated/floor/wood/oak,
/area/awaymission/jungle_planet/outside/cave)
Expand Down Expand Up @@ -886,7 +886,7 @@
/obj/item/clothing/gloves/color/fyellow/old,
/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/obj/structure/cable{
icon_state = "1-2"
},
Expand Down Expand Up @@ -1008,7 +1008,7 @@
/obj/item/stack/sheet/leather,
/obj/item/stack/sheet/leather,
/obj/item/stack/sheet/leather,
/obj/item/clothing/accessory/necklace/dope,
/obj/item/clothing/neck/necklace/dope,
/obj/structure/closet/crate/wooden,
/turf/simulated/floor/engine/cult,
/area/awaymission/jungle_planet/outside/cave)
Expand Down Expand Up @@ -2676,7 +2676,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside)
"dxA" = (
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/obj/machinery/door/window/reinforced/normal{
dir = 8
},
Expand Down Expand Up @@ -3468,8 +3468,8 @@
pixel_x = -9;
pixel_y = 11
},
/obj/item/clothing/accessory/necklace,
/obj/item/clothing/accessory/necklace/locket,
/obj/item/clothing/neck/necklace,
/obj/item/clothing/neck/necklace/locket,
/obj/structure/stone_tile/slab,
/obj/item/stack/ore/plasma,
/turf/simulated/floor/engine/cult,
Expand Down Expand Up @@ -5377,7 +5377,7 @@
pixel_x = 12
},
/obj/item/pen/multi/gold,
/obj/item/clothing/accessory/necklace,
/obj/item/clothing/neck/necklace,
/obj/structure/stone_tile/surrounding_tile/cracked,
/obj/item/stack/ore/plasma,
/obj/item/stack/sheet/mineral/gold{
Expand Down Expand Up @@ -7212,7 +7212,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/outside/river)
"jvT" = (
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/light_emitter{
light_color = "#FFFFFF";
set_cap = 1;
Expand Down Expand Up @@ -7733,7 +7733,7 @@
},
/area/awaymission/jungle_planet/outside)
"kcJ" = (
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/plating/asteroid/ancient{
name = "ground"
},
Expand Down Expand Up @@ -10263,7 +10263,7 @@
/area/awaymission/jungle_planet/outside/cave)
"ncb" = (
/obj/item/clothing/gloves/ring/gold,
/obj/item/clothing/accessory/necklace/locket,
/obj/item/clothing/neck/necklace/locket,
/obj/item/coin/gold,
/obj/effect/spawner/random/dirt/often,
/obj/structure/closet/crate/wooden,
Expand Down Expand Up @@ -10550,7 +10550,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"nAu" = (
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside/river)
"nAK" = (
Expand Down Expand Up @@ -12491,7 +12491,7 @@
/obj/item/coin/gold{
pixel_x = -9
},
/obj/item/clothing/accessory/necklace/locket{
/obj/item/clothing/neck/necklace/locket{
pixel_x = 9
},
/obj/item/stack/ore/plasma,
Expand Down Expand Up @@ -13668,7 +13668,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"rDj" = (
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
"rEW" = (
Expand Down Expand Up @@ -14006,7 +14006,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside/river)
"rVt" = (
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/outside/abandoned)
"rVw" = (
Expand Down Expand Up @@ -15438,7 +15438,7 @@
"tMG" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/cobweb2,
/obj/random/toolbox,
/obj/effect/spawner/random/engineering/toolbox,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
"tNq" = (
Expand Down Expand Up @@ -16467,7 +16467,7 @@
"val" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/sign/poster/contraband/random/west,
/obj/random/tool,
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside)
Expand Down Expand Up @@ -16819,8 +16819,8 @@
"vvz" = (
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/suit/unathi/mantle,
/obj/item/clothing/suit/unathi/mantle,
/obj/item/clothing/neck/cloak/unathi,
/obj/item/clothing/neck/cloak/unathi,
/obj/item/clothing/suit/unathi/robe,
/obj/item/clothing/suit/unathi/robe,
/obj/structure/closet/crate/wooden,
Expand Down Expand Up @@ -17755,10 +17755,10 @@
pixel_y = 11
},
/obj/structure/stone_tile/slab,
/obj/item/clothing/accessory/necklace/locket{
/obj/item/clothing/neck/necklace/locket{
pixel_x = 9
},
/obj/item/clothing/accessory/necklace/locket,
/obj/item/clothing/neck/necklace/locket,
/turf/simulated/floor/engine/cult,
/area/awaymission/jungle_planet/outside/cave)
"wEF" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomZLevels/wildwest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,7 @@
/area/awaymission/wildwest/wildwest_mines)
"sg" = (
/obj/structure/table/glass,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/turf/simulated/floor/wood/oak,
/area/awaymission/wildwest/wildwest_mines)
"sq" = (
Expand Down
Loading

0 comments on commit 48fd5f1

Please sign in to comment.