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

shiptest-ss13 · Oct 7, 2024 · 7da8c6e · 7da8c6e
2 parents 704a54a + 8ca8141
commit 7da8c6e
Show file tree

Hide file tree

Showing 186 changed files with 248 additions and 12,806 deletions.
diff --git a/_maps/RandomRuins/ReebeRuins/reebe_swarmers.dmm b/_maps/RandomRuins/ReebeRuins/reebe_swarmers.dmm
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -2314,20 +2314,6 @@
 /obj/item/reagent_containers/food/snacks/urinalcake,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
-"nb" = (
-/obj/structure/table/wood,
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 8
-	},
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 4
-	},
-/obj/item/flashlight/lamp{
-	pixel_y = 13
-	},
-/obj/item/book/codex_gigas,
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
 "nh" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/dorm/dormtwo)
@@ -2804,32 +2790,6 @@
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/hydroponics)
-"qe" = (
-/obj/structure/closet/secure_closet/freezer{
-	name = "Refrigerator";
-	desc = "A refrigerated cabinet for food."
-	},
-/obj/effect/turf_decal/siding/wideplating/light/end{
-	dir = 4
-	},
-/obj/item/storage/fancy/egg_box,
-/obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/milk,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/flour,
-/obj/item/reagent_containers/condiment/sugar,
-/obj/item/reagent_containers/condiment/sugar,
-/obj/item/reagent_containers/condiment/rice,
-/obj/item/reagent_containers/food/snacks/tofu,
-/obj/item/reagent_containers/food/snacks/tofu,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
 "qh" = (
 /obj/machinery/hydroponics/constructable{
 	pixel_y = 8
@@ -3876,27 +3836,6 @@
 /obj/structure/table,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
-"xb" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/sugar{
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/condiment/rice{
-	pixel_y = 10;
-	pixel_x = 3
-	},
-/obj/item/reagent_containers/condiment/enzyme{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
 "xc" = (
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 8
@@ -4100,10 +4039,6 @@
 "ys" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/dorm)
-"yu" = (
-/obj/item/clothing/mask/gas/monkeymask,
-/turf/open/floor/plating,
-/area/ship/maintenance/fore)
 "yw" = (
 /obj/effect/decal/cleanable/food/tomato_smudge,
 /obj/effect/turf_decal/siding/wood{
@@ -4460,21 +4395,6 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/maintenance/starboard)
-"AH" = (
-/obj/structure/table,
-/obj/item/toy/figure/chef,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/reagent_containers/condiment/saltshaker{
-	pixel_y = 10;
-	pixel_x = -7
-	},
-/obj/item/reagent_containers/condiment/peppermill{
-	pixel_x = 8;
-	pixel_y = 9
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
 "AI" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer4{
 	dir = 6
@@ -4567,6 +4487,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/security/prison)
+"Bf" = (
+/obj/structure/table/wood,
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 8
+	},
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 4
+	},
+/obj/item/flashlight/lamp{
+	pixel_y = 13
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
 "Bi" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4921,6 +4854,27 @@
 /obj/effect/spawner/lootdrop/ration,
 /turf/open/floor/plasteel,
 /area/ship/security/prison)
+"Dj" = (
+/obj/structure/table,
+/obj/item/reagent_containers/condiment/sugar{
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/condiment/rice{
+	pixel_y = 10;
+	pixel_x = 3
+	},
+/obj/item/reagent_containers/condiment/enzyme{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
 "Dm" = (
 /obj/structure/window/reinforced/spawner{
 	dir = 1
@@ -5863,6 +5817,21 @@
 /obj/effect/turf_decal/siding/yellow,
 /turf/open/floor/plasteel,
 /area/ship/security/prison)
+"Ie" = (
+/obj/structure/table,
+/obj/item/toy/figure/chef,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_y = 10;
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
 "Ig" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "quickpoint_shut";
@@ -6210,6 +6179,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/security)
+"Kc" = (
+/obj/item/clothing/mask/gas/monkeymask,
+/turf/open/floor/plating,
+/area/ship/maintenance/fore)
 "Kg" = (
 /obj/effect/turf_decal/siding/red{
 	dir = 8
@@ -8459,6 +8432,32 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm/dormfour)
+"Xf" = (
+/obj/structure/closet/secure_closet/freezer{
+	name = "Refrigerator";
+	desc = "A refrigerated cabinet for food."
+	},
+/obj/effect/turf_decal/siding/wideplating/light/end{
+	dir = 4
+	},
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/food/snacks/tofu,
+/obj/item/reagent_containers/food/snacks/tofu,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
 "Xg" = (
 /obj/machinery/door/window{
 	dir = 4
@@ -9144,7 +9143,7 @@ Mv
 Lu
 rq
 Hm
-nb
+Bf
 dJ
 VG
 oM
@@ -9550,8 +9549,8 @@ PP
 td
 VK
 Fg
-AH
-xb
+Ie
+Dj
 nR
 zq
 mU
@@ -9674,7 +9673,7 @@ pe
 Rr
 KQ
 wa
-qe
+Xf
 Ad
 gZ
 eF
@@ -10356,7 +10355,7 @@ oI
 VU
 Dy
 nh
-yu
+Kc
 nK
 jY
 jY

diff --git a/check_regex.yaml b/check_regex.yaml
@@ -29,7 +29,7 @@ standards:
     - exactly: [1, "/area text paths", '"/area']
     - exactly: [17, "/datum text paths", '"/datum']
     - exactly: [4, "/mob text paths", '"/mob']
-    - exactly: [42, "/obj text paths", '"/obj']
+    - exactly: [36, "/obj text paths", '"/obj']
     - exactly: [0, "/turf text paths", '"/turf']
     - exactly: [115, "text2path uses", "text2path"]
 
@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              262,
+              261,
               "non-bitwise << uses",
               '(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
           ]

diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
@@ -65,23 +65,19 @@
 #define DATA_HUD_FAN 10
 
 //antag HUD defines
-#define ANTAG_HUD_CULT 11
-#define ANTAG_HUD_REV 12
-#define ANTAG_HUD_OPS 13
-#define ANTAG_HUD_WIZ 14
-#define ANTAG_HUD_SHADOW 15
-#define ANTAG_HUD_TRAITOR 16
-#define ANTAG_HUD_NINJA 17
-#define ANTAG_HUD_CHANGELING 18
-#define ANTAG_HUD_ABDUCTOR 19
-#define ANTAG_HUD_DEVIL 20
-#define ANTAG_HUD_SINTOUCHED 21
-#define ANTAG_HUD_SOULLESS 22
-#define ANTAG_HUD_BROTHER 23
-#define ANTAG_HUD_OBSESSED 24
-#define ANTAG_HUD_FUGITIVE 25
-#define ANTAG_HUD_GANGSTER 26
-#define ANTAG_HUD_SPACECOP 27
+#define ANTAG_HUD_REV 11
+#define ANTAG_HUD_OPS 12
+#define ANTAG_HUD_WIZ 13
+#define ANTAG_HUD_SHADOW 14
+#define ANTAG_HUD_TRAITOR 15
+#define ANTAG_HUD_NINJA 16
+#define ANTAG_HUD_CHANGELING 17
+#define ANTAG_HUD_ABDUCTOR 18
+#define ANTAG_HUD_BROTHER 19
+#define ANTAG_HUD_OBSESSED 20
+#define ANTAG_HUD_FUGITIVE 21
+#define ANTAG_HUD_GANGSTER 22
+#define ANTAG_HUD_SPACECOP 23
 
 
 // Notification action types

diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm
@@ -10,5 +10,3 @@
 #define CINEMATIC_NUKE_NO_CORE 10
 #define CINEMATIC_NUKE_FAR 11
 #define CINEMATIC_NUKE_CLOWNOP 12
-#define CINEMATIC_CULT_NUKE 13
-#define CINEMATIC_CULT_FAIL 14
diff --git a/code/__DEFINES/cult.dm b/code/__DEFINES/cult.dm
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -100,8 +100,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/royal/queen))
 
-#define istruedevil(A) (istype(A, /mob/living/carbon/true_devil))
-
 //Silicon mobs
 #define issilicon(A) (istype(A, /mob/living/silicon))
 
@@ -138,8 +136,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define ishostile(A) (istype(A, /mob/living/simple_animal/hostile))
 
-#define isswarmer(A) (istype(A, /mob/living/simple_animal/hostile/swarmer))
-
 #define isguardian(A) (istype(A, /mob/living/simple_animal/hostile/guardian))
 
 #define isconstruct(A) (istype(A, /mob/living/simple_animal/hostile/construct))

diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm
@@ -12,7 +12,6 @@
 #define LANGUAGE_APHASIA "aphasia"
 #define LANGUAGE_CULTIST "cultist"
 #define LANGUAGE_CURATOR "curator"
-#define LANGUAGE_DEVIL "devil"
 #define LANGUAGE_GLAND "gland"
 #define LANGUAGE_HAT "hat"
 #define LANGUAGE_HIGH "high"