shiptest-ss13 · rye-rice · Oct 7, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
@@ -2325,7 +2325,6 @@
 /obj/item/flashlight/lamp{
 	pixel_y = 13
 	},
-/obj/item/book/codex_gigas,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "nh" = (

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: [117, "text2path uses", "text2path"]
 
@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              266,
+              265,
               "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"

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
@@ -28,7 +28,6 @@
 #define LEGCUFF_LAYER 5
 #define HANDS_LAYER 4
 #define BODY_FRONT_LAYER 3
-#define HALO_LAYER 2 //blood cult ascended halo, because there's currently no better solution for adding/removing
 #define FIRE_LAYER 1 //If you're on fire
 #define TOTAL_LAYERS 31 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_;
 
@@ -277,9 +276,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define NUKE_SYNDICATE_BASE 3
 #define STATION_DESTROYED_NUKE 4
 #define STATION_EVACUATED 5
-#define CULT_ESCAPE 11
-#define CULT_FAILURE 12
-#define CULT_SUMMON 13
 #define NUKE_MISS 14
 #define OPERATIVES_KILLED 15
 #define OPERATIVE_SKIRMISH 16
@@ -378,7 +374,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define TELEPORT_CHANNEL_QUANTUM "quantum" //Quantum-based teleportation, requires both sender and receiver, but is free from normal disruption
 #define TELEPORT_CHANNEL_WORMHOLE "wormhole"	//Wormhole teleportation, is not disrupted by bluespace fluctuations but tends to be very random or unsafe
 #define TELEPORT_CHANNEL_MAGIC "magic" //Magic teleportation, does whatever it wants (unless there's antimagic)
-#define TELEPORT_CHANNEL_CULT "cult" //Cult teleportation, does whatever it wants (unless there's holiness)
 #define TELEPORT_CHANNEL_FREE "free" //Anything else
 
 //Run the world with this parameter to enable a single run though of the game setup and tear down process with unit tests in between

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -76,7 +76,6 @@
 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
 #define LARVA_BODYPART "larva"
-#define DEVIL_BODYPART "devil"
 
 //Defines for Species IDs
 #define SPECIES_ABDUCTOR "abductor"
@@ -416,9 +415,6 @@
 
 #define SILENCE_RANGED_MESSAGE (1<<0)
 
-///Swarmer flags
-#define SWARMER_LIGHT_ON (1<<0)
-
 /// Returns whether or not the given mob can succumb
 #define CAN_SUCCUMB(target) (HAS_TRAIT(target, TRAIT_CRITICAL_CONDITION) && !HAS_TRAIT(target, TRAIT_NODEATH))
 

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
@@ -21,7 +21,6 @@
 #define DEADMIN_POSITION_SECURITY (1<<18)
 #define DEADMIN_POSITION_SILICON (1<<19)
 #define SOUND_ENDOFROUND (1<<20)
-#define ADMIN_IGNORE_CULT_GHOST (1<<21)
 #define SPLIT_ADMIN_TABS (1<<22)
 #define FAST_MC_REFRESH (1<<23)
 

diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
@@ -17,12 +17,10 @@
 #define ROLE_REV_SUCCESSFUL "Victorious Revolutionary"
 #define ROLE_ALIEN "Xenomorph"
 #define ROLE_PAI "pAI"
-#define ROLE_CULTIST "Cultist"
 #define ROLE_NINJA "Space Ninja"
 #define ROLE_MONKEY "Monkey"
 #define ROLE_ABDUCTOR "Abductor"
 #define ROLE_REVENANT "Revenant"
-#define ROLE_DEVIL "Devil"
 #define ROLE_BROTHER "Blood Brother"
 #define ROLE_BRAINWASHED "Brainwashed Victim"
 #define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety.
@@ -52,13 +50,11 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_MALF,
 	ROLE_ALIEN,
 	ROLE_PAI,
-	ROLE_CULTIST = /datum/game_mode/cult,
 	ROLE_NINJA,
 	ROLE_OBSESSED,
 	ROLE_SPACE_DRAGON,
 	ROLE_REVENANT,
 	ROLE_ABDUCTOR,
-	ROLE_DEVIL = /datum/game_mode/devil,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_SENTIENCE,
 	ROLE_BORER

diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
@@ -64,8 +64,6 @@
 
 #define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
 
-#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
-
 #define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage
 
 #define STATUS_EFFECT_SAWBLEED /datum/status_effect/stacking/saw_bleed //if the bleed builds up enough, takes a ton of damage

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -352,7 +352,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define CYBORG_ITEM_TRAIT "cyborg-item"
 #define ADMIN_TRAIT "admin" // (B)admins only.
 #define CHANGELING_TRAIT "changeling"
-#define CULT_TRAIT "cult"
 #define CURSED_ITEM_TRAIT "cursed-item" // The item is magically cursed
 #define ABSTRACT_ITEM_TRAIT "abstract-item"
 #define STATUS_EFFECT_TRAIT "status-effect"
@@ -391,7 +390,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define EYES_COVERED "eyes_covered"
-#define CULT_EYES "cult_eyes"
 #define TRAIT_SANTA "santa"
 #define SCRYING_ORB "scrying-orb"
 #define ABDUCTOR_ANTAGONIST "abductor-antagonist"
@@ -428,8 +426,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define WARPWHISTLE_TRAIT "warpwhistle"
 ///Turf trait for when a turf is transparent
 #define TURF_Z_TRANSPARENT_TRAIT "turf_z_transparent"
-/// Trait applied by by [/datum/component/soulstoned]
-#define SOULSTONE_TRAIT "soulstone"
 /// Trait applied to slimes by low temperature
 #define SLIME_COLD "slime-cold"
 /// Trait applied to bots by being tipped over

diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
@@ -42,7 +42,6 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/ship/engin
 	// Passed into the above proc as list/break_if_found
 	var/static/area_or_turf_fail_types = typecacheof(list(
 		/turf/open/space,
-		/area/shuttle,
 		))
 	// Ignore these areas and dont let people expand them. They can expand into them though
 	var/static/blacklisted_areas = typecacheof(list(

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
@@ -6,7 +6,6 @@ block( \
 )
 
 #define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL))
-#define CULT_POLL_WAIT 2400
 
 /proc/get_area_name(atom/X, format_text = FALSE)
 	var/area/A = isarea(X) ? X : get_area(X)

diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
@@ -6,8 +6,5 @@ GLOBAL_VAR(survivor_report) //Contains shared survivor report for roundend repor
 
 GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
 
-//TODO clear this one up too
-GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)
-
 GLOBAL_DATUM(sac_mind, /datum/mind) // So Cryo can modify sac stuff
 GLOBAL_VAR_INIT(sac_image, null)
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
@@ -243,7 +243,6 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 ))
 
 GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
-		/obj/effect/rune/teleport = 1,
 		/obj/item/clothing/gloves/color/yellow = 1,
 		/obj/item/clothing/head/helmet/abductor = 1,
 		/obj/item/clothing/head/helmet/justice =1,

diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
@@ -11,7 +11,6 @@
 #define POLL_IGNORE_CONSTRUCT "construct"
 #define POLL_IGNORE_SPIDER "spider"
 #define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_SWARMER "swarmer"
 #define POLL_IGNORE_DRONE "drone"
 #define POLL_IGNORE_FUGITIVE "fugitive"
 #define POLL_IGNORE_DEFECTIVECLONE "defective_clone" //WS Edit - Cloning
@@ -35,7 +34,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_CONSTRUCT = "Construct",
 	POLL_IGNORE_SPIDER = "Spiders",
 	POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
-	POLL_IGNORE_SWARMER = "Swarmer shells",
 	POLL_IGNORE_DRONE = "Drone shells",
 	POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
 	POLL_IGNORE_DEFECTIVECLONE = "Defective clone", //WS Edit - Cloning

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -37,7 +37,6 @@
 //Middle left indicators
 #define ui_lingchemdisplay "WEST,CENTER-1:15"
 #define ui_lingstingdisplay "WEST:6,CENTER-3:11"
-#define ui_devilsouldisplay "WEST:6,CENTER-1:15"
 
 //Lower center, persistent menu
 #define ui_sstore1 "CENTER-5:10,SOUTH:5"