Merge remote-tracking branch 'upstream/master' into refactor/equip

ParadiseSS13 · Jan 4, 2025 · cddea1e · cddea1e
2 parents 28da5ab + 0b35706
commit cddea1e
Show file tree

Hide file tree

Showing 318 changed files with 8,300 additions and 5,324 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
@@ -14,7 +14,7 @@
 /area/ruin/powered/greed)
 "e" = (
 /obj/structure/table/wood/poker,
-/obj/item/gun/projectile/revolver/russian/soul,
+/obj/item/toy/russian_revolver/soul,
 /obj/machinery/light/small{
 	dir = 1
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -172,7 +172,7 @@
 /area/ruin/space/unpowered)
 "xQ" = (
 /obj/structure/table,
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "yq" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -9964,7 +9964,7 @@
 	pixel_y = 7;
 	pixel_x = -3
 	},
-/obj/item/clothing/accessory/horrible{
+/obj/item/clothing/neck/tie/horrible{
 	pixel_y = -2;
 	pixel_x = 2
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -1127,7 +1127,7 @@
 	icon_state = "0-8"
 	},
 /obj/structure/closet/crate/medical,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/healthanalyzer,
 /obj/item/reagent_containers/iv_bag/blood/o_minus,
 /obj/item/reagent_containers/iv_bag/blood/o_minus,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -223,7 +223,7 @@
 	},
 /area/ruin/space/powered/bar)
 "aY" = (
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/stack/medical/bruise_pack/advanced,
 /obj/item/scalpel,
 /obj/structure/table,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -3435,7 +3435,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"
@@ -7950,7 +7950,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"

diff --git a/_maps/map_files/shuttles/emergency_shadow.dmm b/_maps/map_files/shuttles/emergency_shadow.dmm
@@ -154,7 +154,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "ge" = (
 /obj/structure/table/glass/reinforced/plastitanium,
@@ -230,9 +231,6 @@
 	},
 /turf/simulated/floor/catwalk,
 /area/shuttle/escape)
-"jR" = (
-/turf/simulated/floor/engine/o2,
-/area/shuttle/escape)
 "kx" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/mineral/plastitanium/red/brig,
@@ -354,7 +352,8 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "pi" = (
 /obj/effect/turf_decal/stripes/white/line{
@@ -565,7 +564,8 @@
 	},
 /area/shuttle/escape)
 "zj" = (
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "zs" = (
 /obj/structure/reagent_dispensers/fueltank,
@@ -639,7 +639,8 @@
 /area/template_noop)
 "CD" = (
 /obj/machinery/igniter/shadow,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "CK" = (
 /obj/structure/shuttle/engine/propulsion/burst{
@@ -680,7 +681,8 @@
 /area/shuttle/escape)
 "DY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "DZ" = (
 /obj/effect/turf_decal/stripes/red/corner{
@@ -739,7 +741,8 @@
 	dir = 4;
 	invisibility = 99
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "Gx" = (
 /obj/structure/extinguisher_cabinet{
@@ -1151,7 +1154,8 @@
 	dir = 9
 	},
 /obj/machinery/atmospherics/meter,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "Xp" = (
 /obj/structure/marker_beacon/dock_marker/collision,
@@ -1357,9 +1361,9 @@ Lv
 OL
 Bu
 tb
-jR
+zj
 CD
-jR
+zj
 cX
 wF
 cH