Merge remote-tracking branch 'upstream/master' into gostorageboygo

shiptest-ss13 · Mar 17, 2024 · e1e1851 · e1e1851
2 parents 9be0801 + c14e1e5
commit e1e1851
Show file tree

Hide file tree

Showing 128 changed files with 1,414 additions and 460 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -923,7 +923,7 @@
 /obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/folder/syndicate/mining,
+/obj/item/folder/documents/syndicate/mining,
 /obj/item/paper/fluff/gateway,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/onehalf)

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -208,7 +208,7 @@
 /area/ruin/space/has_grav/syndicircle/halls)
 "gi" = (
 /obj/structure/table/reinforced,
-/obj/item/folder/syndicate/red,
+/obj/item/folder/documents/syndicate/red,
 /turf/open/floor/plasteel/tech,
 /area/ruin/space/has_grav/syndicircle/winter)
 "gp" = (

diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Chronicle-class Sensor Frigate",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",

diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Inkwell-class Supply Freighter",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",

diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Paracelsus-class Medical Corvette",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -16470,7 +16470,7 @@
 /area/centcom)
 "wCp" = (
 /obj/structure/table/wood/fancy/blue,
-/obj/item/folder/solgov/red{
+/obj/item/folder/documents/solgov{
 	pixel_x = -3
 	},
 /obj/item/folder/solgov{

diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -322,7 +322,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/camera/autoname{
 	dir = 6

diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm
@@ -2589,7 +2589,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/toilet)
 "OF" = (
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /obj/structure/table/reinforced,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plasteel/dark,

diff --git a/_maps/shuttles/independent/independent_halftrack.dmm b/_maps/shuttles/independent/independent_halftrack.dmm
@@ -271,7 +271,7 @@
 /area/ship/security/range)
 "hF" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "hH" = (

diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
@@ -234,7 +234,7 @@
 "dH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /obj/machinery/light/directional/south,
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)

diff --git a/_maps/shuttles/independent/independent_rube_goldberg.dmm b/_maps/shuttles/independent/independent_rube_goldberg.dmm
@@ -1281,7 +1281,7 @@
 "mj" = (
 /obj/structure/table/wood,
 /obj/machinery/light/directional/east,
-/obj/machinery/fax{
+/obj/machinery/fax/indie{
 	pixel_y = -5
 	},
 /obj/effect/turf_decal/corner/opaque/yellow/border{

diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -2019,7 +2019,7 @@
 /obj/item/gps{
 	gpstag = "PHARM1"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /obj/machinery/button/door{
 	dir = 4;
 	id = "pharmbridge";

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1499,7 +1499,7 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen/full,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/table/wood,
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /turf/open/floor/plasteel,
 /area/ship/security)
 "pC" = (
@@ -2047,7 +2047,7 @@
 /obj/effect/turf_decal/corner/opaque/neutral/half{
 	dir = 1
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/indie,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)

diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -115,7 +115,7 @@
 /area/ship/hallway/fore)
 "bJ" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/inteq,
 /obj/machinery/light/directional/north,
 /obj/structure/cable{
 	icon_state = "2-8"

diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -2094,7 +2094,7 @@
 "RM" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/fax,
+/obj/machinery/fax/inteq,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "Sh" = (

diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1160,7 +1160,7 @@
 /area/ship/hallway/central)
 "hK" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/inteq,
 /obj/machinery/button/door{
 	id = "talos_bridge";
 	name = "Bridge Shutters";

diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -2757,7 +2757,7 @@
 	dir = 8
 	},
 /obj/machinery/airalarm/directional/south,
-/obj/machinery/fax{
+/obj/machinery/fax/inteq{
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/dark,

diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -2919,7 +2919,7 @@
 /area/ship/bridge)
 "TQ" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/inteq,
 /obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8

diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm
@@ -5841,7 +5841,7 @@
 "FK" = (
 /obj/machinery/airalarm/directional/south,
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/clip,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "FN" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -3569,7 +3569,7 @@
 /area/ship/maintenance/fore)
 "JV" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/structure/sign/poster/retro/random{
 	pixel_y = 32
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -9598,7 +9598,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -10619,7 +10619,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/item/radio/intercom/wideband/directional/west{
 	pixel_y = 8
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -2958,7 +2958,7 @@
 /area/ship/science)
 "tc" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/effect/turf_decal/corner/opaque/ntblue,
 /obj/effect/turf_decal/corner/opaque/ntblue{
 	dir = 4

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -1765,7 +1765,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sl" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -479,7 +479,7 @@
 /area/ship/engineering/atmospherics)
 "ed" = (
 /obj/structure/table,
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
@@ -3937,7 +3937,7 @@
 /turf/closed/wall,
 /area/ship/cargo)
 "Fv" = (
-/obj/machinery/fax,
+/obj/machinery/fax/nanotrasen,
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)

diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
@@ -2054,7 +2054,7 @@
 /area/ship/engineering/engine)
 "zX" = (
 /obj/structure/table/wood,
-/obj/machinery/fax,
+/obj/machinery/fax/roumain,
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 8
 	},

diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -256,8 +256,8 @@
 /obj/item/clothing/head/solgov/captain,
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
-/obj/item/folder/solgov/red,
-/obj/item/folder/solgov/red,
+/obj/item/folder/documents/solgov,
+/obj/item/folder/documents/solgov,
 /obj/item/clothing/under/solgov/formal,
 /obj/item/clothing/gloves/combat,
 /obj/item/storage/backpack/captain,
@@ -771,7 +771,7 @@
 /area/ship/crew)
 "hr" = (
 /obj/structure/table/wood/fancy/purple,
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /obj/item/desk_flag/solgov{
 	pixel_x = 8;
 	pixel_y = 13
@@ -2999,7 +2999,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/security/armory)
 "CU" = (
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /obj/structure/table/wood,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/wood,
@@ -3577,7 +3577,7 @@
 /area/ship/security/armory)
 "Jh" = (
 /obj/structure/table/wood/fancy/blue,
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /obj/item/desk_flag/solgov{
 	pixel_x = -9;
 	pixel_y = 14
@@ -4121,7 +4121,7 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
-/obj/item/folder/solgov/red,
+/obj/item/folder/documents/solgov,
 /obj/item/clothing/under/solgov/formal,
 /obj/item/clothing/head/solgov,
 /obj/item/storage/belt/sabre/solgov,

diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -2320,7 +2320,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "pd" = (
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /obj/structure/table/wood/fancy/purple,
 /turf/open/floor/wood/maple,
 /area/ship/crew/dorm/dormtwo)
@@ -5197,7 +5197,7 @@
 /area/ship/crew/canteen/kitchen)
 "HT" = (
 /obj/structure/table/wood/fancy/blue,
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /turf/open/floor/wood/maple,
 /area/ship/bridge)
 "HV" = (
@@ -5784,8 +5784,8 @@
 /obj/item/clothing/under/solgov/formal,
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
-/obj/item/folder/solgov/red,
-/obj/item/folder/solgov/red,
+/obj/item/folder/documents/solgov,
+/obj/item/folder/documents/solgov,
 /obj/structure/closet/secure_closet{
 	icon_state = "cap";
 	name = "\proper captain's locker";

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -1884,7 +1884,7 @@
 	pixel_x = 8;
 	pixel_y = 12
 	},
-/obj/machinery/fax,
+/obj/machinery/fax/solgov,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "sp" = (
@@ -2483,7 +2483,7 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
-/obj/item/folder/solgov/red,
+/obj/item/folder/documents/solgov,
 /obj/item/clothing/under/solgov/formal,
 /obj/item/clothing/head/solgov,
 /obj/item/storage/belt/sabre/solgov,
@@ -3581,8 +3581,8 @@
 /obj/item/clothing/under/solgov/formal,
 /obj/item/folder/solgov,
 /obj/item/folder/solgov,
-/obj/item/folder/solgov/red,
-/obj/item/folder/solgov/red,
+/obj/item/folder/documents/solgov,
+/obj/item/folder/documents/solgov,
 /obj/structure/closet/secure_closet{
 	icon_state = "cap";
 	name = "\proper captain's locker";

diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm
@@ -17,7 +17,7 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/machinery/fax/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "c" = (

diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
@@ -436,7 +436,7 @@
 /area/ship/bridge)
 "ZG" = (
 /obj/structure/table,
-/obj/machinery/fax{
+/obj/machinery/fax/nanotrasen{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/corner/opaque/green/half,

diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -4187,7 +4187,7 @@
 	pixel_y = 9
 	},
 /obj/item/radio/intercom/wideband/directional/north,
-/obj/machinery/fax,
+/obj/machinery/fax/syndicate,
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},

diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -604,7 +604,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm)
 "pa" = (
-/obj/machinery/fax,
+/obj/machinery/fax/syndicate,
 /obj/item/toy/figure/detective{
 	name = "Intel Buddy";
 	pixel_x = 5;