fix fax_name, ruins spawn with ruin subtype

shiptest-ss13 · Jan 25, 2024 · 9a00495 · 9a00495
1 parent cd8bec6
commit 9a00495
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -3119,7 +3119,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax/frontiersmen,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/bridge)
 "Ls" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -1330,7 +1330,7 @@
 "OW" = (
 /obj/structure/table/reinforced,
 /obj/item/trash/syndi_cakes,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "Ph" = (

diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -956,7 +956,7 @@
 /area/ruin/space)
 "xK" = (
 /obj/structure/table/wood,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "xT" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
@@ -401,7 +401,7 @@
 /area/ruin/powered)
 "dT" = (
 /obj/structure/table/wood,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plating,
 /area/ruin/powered)
 "dU" = (

diff --git a/_maps/outpost/hangar/nt_asteroid_20x20.dmm b/_maps/outpost/hangar/nt_asteroid_20x20.dmm
@@ -1037,7 +1037,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plasteel/dark{
 	planetary_atmos = 1
 	},

diff --git a/_maps/outpost/hangar/nt_asteroid_40x20.dmm b/_maps/outpost/hangar/nt_asteroid_40x20.dmm
@@ -1233,7 +1233,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -3558,7 +3558,7 @@
 /area/outpost/crew/library)
 "mZ" = (
 /obj/structure/table/wood,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plasteel,
 /area/outpost/crew/canteen)
 "na" = (

diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
@@ -7463,7 +7463,7 @@
 /area/outpost/security/armory)
 "XG" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/outpost/security)

diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
@@ -74,7 +74,7 @@
 	GLOB.fax_machines += src
 	if(!fax_id)
 		fax_id = SSnetworks.make_address()
-	if(fax_name == initial(fax_name))
+	if(fax_name == initial(fax_name) && !admin_fax_id)
 		fax_name = "[get_area_name(src)] Fax Machine"
 	wires = new /datum/wires/fax(src)