Merge remote-tracking branch 'upstream/master' into Flowers-for-Aegis

_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -150,7 +150,7 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
-/obj/item/clothing/head/helmet/chaplain/ancient{
+/obj/item/clothing/head/witchunter{
 	pixel_y = 13;
 	pixel_x = -5
 	},

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -2809,10 +2809,9 @@
 /obj/item/clothing/head/collectable/chef,
 /obj/item/clothing/head/collectable/HoP,
 /obj/item/clothing/head/collectable/rabbitears,
-/obj/item/clothing/head/helmet/chaplain,
+/obj/item/clothing/head/witchunter,
 /obj/item/clothing/neck/cloak/trans,
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/item/clothing/neck/beads,
 /obj/item/clothing/neck/necklace/dope,
 /obj/item/clothing/neck/stripedredscarf,

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -424,7 +424,7 @@
 "qo" = (
 /obj/structure/closet/cabinet,
 /obj/item/spear/bonespear,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /obj/item/reagent_containers/food/snacks/grown/berries/death,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
@@ -461,7 +461,7 @@
 /area/ruin/wasteplanet)
 "qU" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "rh" = (
@@ -492,7 +492,7 @@
 "sV" = (
 /obj/structure/closet/cabinet,
 /obj/item/claymore/bone,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "tB" = (

_maps/configs/syndicate_gorlex_komodo.json

@@ -33,7 +33,7 @@
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
 			"slots": 1
 		},
 		"Trooper": {
@@ -45,7 +45,7 @@
 			"slots": 2
 		},
 		"Bridge Officer": {
-			"outfit": "/datum/outfit/job/syndicate/head_of_personnel",
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
 			"slots": 1
 		}
 	},

_maps/shuttles/pgf/pgf_crying_sun.dmm

@@ -6124,6 +6124,9 @@
 	pixel_y = -9;
 	pixel_x = -3
 	},
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = -11
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
 "Wc" = (

_maps/shuttles/roumain/srm_elder.dmm

@@ -2617,7 +2617,7 @@
 /obj/item/clothing/under/suit/roumain,
 /obj/item/clothing/suit/armor/roumain,
 /obj/item/clothing/head/cowboy/sec/roumain,
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
+/obj/item/clothing/suit/armor/witchhunter,
 /obj/item/flashlight/lantern,
 /obj/structure/closet/secure_closet/hunter,
 /obj/item/lighter,

_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm

@@ -188,17 +188,16 @@
 /turf/open/floor/plating/rust,
 /area/ship/maintenance/starboard)
 "dD" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/syndicate,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "dG" = (
@@ -372,21 +371,21 @@
 	pixel_x = -12;
 	pixel_y = 7
 	},
-/obj/item/clothing/under/syndicate/sniper,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/suit/armor/vest/duster,
 /obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "Bridge Officer's Locker";
 	req_access_txt = "57"
 	},
 /obj/item/melee/classic_baton/telescopic,
-/obj/item/clothing/neck/chameleon,
 /obj/item/radio/headset/syndicate,
 /obj/item/megaphone{
 	pixel_x = -2
 	},
+/obj/item/clothing/under/syndicate/cybersun/officer,
+/obj/item/clothing/suit/cybersun_suit,
+/obj/item/clothing/head/HoS/cybersun,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "eN" = (
@@ -653,12 +652,10 @@
 	dir = 1;
 	layer = 2.8
 	},
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/obj/item/clothing/under/syndicate,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
@@ -668,6 +665,8 @@
 	pixel_x = -23;
 	pixel_y = 4
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "hk" = (
@@ -1156,8 +1155,6 @@
 /obj/structure/closet/wall/orange/directional/south{
 	name = "Engineering locker"
 	},
-/obj/item/clothing/under/syndicate/coldres,
-/obj/item/clothing/suit/toggle/industrial,
 /obj/item/clothing/shoes/workboots,
 /obj/item/clothing/head/welding,
 /obj/item/clothing/head/hardhat/red,
@@ -1174,6 +1171,8 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/item/clothing/under/syndicate/hardliners,
+/obj/item/clothing/suit/hazardvest/hardliners,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "ls" = (
@@ -2880,23 +2879,19 @@
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/c10mm,
 /obj/item/clothing/gloves/tackler/combat/insulated,
-/obj/item/clothing/suit/armor/vest/leather{
-	desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."
-	},
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/head/HoS/beret/syndicate,
 /obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "Sergeant's Locker";
 	req_access_txt = "58"
 	},
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/clothing/suit/armor/vest/blueshirt,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate,
 /obj/item/clothing/accessory/holster,
 /obj/item/clothing/shoes/combat,
 /obj/item/radio/headset/syndicate,
+/obj/item/clothing/under/syndicate/hardliners/officer,
+/obj/item/clothing/suit/armor/hardliners/sergeant,
+/obj/item/clothing/head/hardliners/peaked,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "AS" = (
@@ -3124,18 +3119,17 @@
 	name = "captain's locker";
 	req_access_txt = "20"
 	},
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/glasses/thermal/eyepatch,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/clothing/head/HoS/syndicate,
 /obj/item/gun/ballistic/revolver,
 /obj/item/clothing/under/syndicate/sniper,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/officer,
+/obj/item/clothing/suit/toggle/armor/vest/hardliners,
+/obj/item/clothing/head/hardliners/peaked,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "El" = (
@@ -3347,7 +3341,6 @@
 	},
 /area/ship/maintenance/starboard)
 "GD" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -3356,11 +3349,12 @@
 	dir = 9
 	},
 /obj/item/clothing/mask/balaclava,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "GJ" = (
@@ -3845,7 +3839,6 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "Lb" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/neck/scarf/red,
 /obj/item/clothing/mask/bandana/skull,
 /obj/item/clothing/mask/gas/syndicate,
@@ -3855,11 +3848,12 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/item/clothing/under/utility,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Lj" = (
@@ -4064,21 +4058,16 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/item/clothing/under/syndicate/skirt,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Ni" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/head/helmet/operator,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
@@ -4090,9 +4079,21 @@
 	name = "Armor Locker";
 	req_access_txt = "1"
 	},
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "Nj" = (
@@ -4271,7 +4272,6 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo)
 "PE" = (
-/obj/structure/chair/comfy,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 8
@@ -4281,6 +4281,7 @@
 	pixel_y = -1
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/structure/chair/comfy/red,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "PG" = (
@@ -5096,17 +5097,17 @@
 /area/ship/hallway/central)
 "WQ" = (
 /obj/structure/railing,
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
 /obj/item/clothing/mask/balaclava,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "WR" = (
@@ -5426,12 +5427,8 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/item/clothing/under/utility,
 /obj/item/clothing/suit/longcoat/roboblack,
-/obj/item/clothing/suit/apron/surgical,
-/obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/mask/surgical,
-/obj/item/clothing/head/beret/black,
 /obj/item/clothing/gloves/color/latex/nitrile/evil{
 	pixel_x = 1;
 	pixel_y = -3
@@ -5442,6 +5439,9 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
+/obj/item/clothing/suit/hardliners,
+/obj/item/clothing/head/hardliners,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "Zy" = (

check_regex.yaml

@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              268,
+              265,
               "non-bitwise << uses",
               '(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
           ]

code/__DEFINES/misc.dm

@@ -445,11 +445,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define FALL_NO_MESSAGE (1<<1) //Used to suppress the "[A] falls through [old_turf]" messages where it'd make little sense at all, like going downstairs.
 #define FALL_STOP_INTERCEPTING (1<<2) //Used in situations where halting the whole "intercept" loop would be better, like supermatter dusting (and thus deleting) the atom.
 
-//Religion
-
-#define HOLY_ROLE_PRIEST 1 //default priestly role
-#define HOLY_ROLE_HIGHPRIEST 2 //the one who designates the religion
-
 #define ALIGNMENT_GOOD "good"
 #define ALIGNMENT_NEUT "neutral"
 #define ALIGNMENT_EVIL "evil"