Merge branch 'master' into rockruinsnew

shiptest-ss13 · May 2, 2024 · 7c20093 · 7c20093
2 parents 34653f4 + 3c70400
commit 7c20093
Show file tree

Hide file tree

Showing 44 changed files with 817 additions and 422 deletions.
diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json
@@ -23,7 +23,7 @@
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/syndicate/ce/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr",
 			"officer": true,
 			"slots": 1
 		},
@@ -36,7 +36,7 @@
 			"slots": 2
 		},
 		"Junior Agent": {
-			"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr",
 			"slots": 2
 		}
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1092,16 +1092,16 @@
 	req_access = list(20)
 	},
 /obj/item/clothing/suit/hooded/wintercoat/captain,
-/obj/item/clothing/under/rank/command/captain/nt,
-/obj/item/clothing/under/rank/command/captain/nt/skirt,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/item/clothing/under/nanotrasen/captain,
 /obj/item/clothing/shoes/laceup,
-/obj/item/clothing/head/caphat/nt,
+/obj/item/clothing/head/nanotrasen/captain/peaked,
+/obj/item/clothing/head/nanotrasen/captain,
 /obj/item/stock_parts/cell/gun,
 /obj/item/gun/energy/laser,
 /obj/item/megaphone/command,
 /obj/machinery/light/small/directional/east,
-/obj/item/clothing/head/caphat/parade,
-/obj/item/clothing/suit/armor/vest/capcarapace,
+/obj/item/clothing/suit/armor/nanotrasen/captain,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fy" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -3394,8 +3394,10 @@
 	},
 /obj/item/stock_parts/cell/gun,
 /obj/item/gun/energy/laser,
-/obj/item/clothing/under/rank/command/captain/nt,
-/obj/item/clothing/head/caphat/nt,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/item/clothing/under/nanotrasen/captain,
+/obj/item/clothing/suit/armor/nanotrasen/captain,
+/obj/item/clothing/head/nanotrasen/captain/peaked,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/glasses/sunglasses,
 /obj/effect/turf_decal/borderfloor{

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -1027,9 +1027,10 @@
 /obj/item/storage/backpack/satchel/cap,
 /obj/item/storage/backpack/captain,
 /obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/rank/command/captain/nt/skirt,
-/obj/item/clothing/under/rank/command/captain/nt,
-/obj/item/clothing/suit/armor/vest/capcarapace/alt,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/item/clothing/under/nanotrasen/captain,
+/obj/item/clothing/suit/armor/nanotrasen/captain,
+/obj/item/clothing/suit/armor/nanotrasen/captain/parade,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/storage/belt/sabre,
@@ -5257,8 +5258,8 @@
 /obj/item/storage/backpack,
 /obj/item/storage/backpack/satchel/leather,
 /obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
-/obj/item/clothing/under/rank/command/head_of_personnel/nt,
+/obj/item/clothing/under/nanotrasen/officer/skirt,
+/obj/item/clothing/under/nanotrasen/officer,
 /obj/item/clothing/suit/armor/vest/hop,
 /obj/item/clothing/gloves/color/white,
 /obj/item/clothing/glasses/sunglasses,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -1510,8 +1510,8 @@
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/item/clothing/under/rank/command/head_of_personnel/nt,
-/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
+/obj/item/clothing/under/nanotrasen/officer,
+/obj/item/clothing/under/nanotrasen/officer/skirt,
 /turf/open/floor/wood,
 /area/ship/crew/crewthree)
 "lg" = (
@@ -5490,15 +5490,16 @@
 /obj/item/storage/belt/sabre,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/suit/armor/vest/capcarapace,
-/obj/item/clothing/under/rank/command/captain/parade,
 /obj/item/clothing/shoes/laceup,
 /obj/item/door_remote/captain,
-/obj/item/clothing/suit/armor/vest/capcarapace/alt,
 /obj/item/clothing/gloves/color/captain/nt,
-/obj/item/clothing/under/rank/command/captain/nt/skirt,
-/obj/item/clothing/under/rank/command/captain/nt,
-/obj/item/clothing/head/caphat/parade,
-/obj/item/clothing/head/caphat/nt,
+/obj/item/clothing/suit/armor/nanotrasen/captain,
+/obj/item/clothing/suit/armor/nanotrasen/captain/parade,
+/obj/item/clothing/gloves/color/captain/nt,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/item/clothing/under/nanotrasen/captain,
+/obj/item/clothing/head/nanotrasen/captain/peaked,
+/obj/item/clothing/head/nanotrasen/captain,
 /turf/open/floor/wood,
 /area/ship/crew/crewtwo)
 "UN" = (

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -55,12 +55,12 @@
 	req_access = list(20)
 	},
 /obj/item/storage/backpack/security,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
-/obj/item/clothing/head/HoS/syndicate,
+/obj/item/clothing/head/ngrcap,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/gun/ballistic/revolver,
 /obj/item/ammo_box/a357/match,
@@ -1497,14 +1497,10 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
 /obj/item/clothing/head/soft/black,
 /obj/item/clothing/head/soft/black,
 /obj/item/clothing/head/soft/black,
@@ -1647,7 +1643,7 @@
 	req_access = list(56)
 	},
 /obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/syndicate/gorlex,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/clothing/suit/toggle/industrial,
 /obj/item/clothing/gloves/combat,
 /obj/item/storage/belt/utility/chief{

diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
@@ -92,7 +92,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
 			/obj/item/clothing/under/rank/security/head_of_security/alt,//WS Edit - Better security jumpsuit sprites
 			/obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
-			/obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade,
+			/obj/item/clothing/under/rank/security/head_of_security/parade,
 			/obj/item/clothing/under/rank/security/head_of_security/parade/female, //WS Edit - Better Command Uniforms
 			/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/melee/baton/abductor,
 			/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,

diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
@@ -206,14 +206,6 @@
 /obj/item/banner/command/check_inspiration(mob/living/carbon/human/H)
 	return HAS_TRAIT(H, TRAIT_MINDSHIELD) //Command is stalwart but rewards their allies.
 
-/datum/crafting_recipe/command_banner
-	name = "Command Banner"
-	result = /obj/item/banner/command/mundane
-	time = 40
-	reqs = list(/obj/item/stack/rods = 2,
-				/obj/item/clothing/under/rank/command/captain/parade = 1)
-	category = CAT_MISC
-
 /obj/item/banner/red
 	name = "red banner"
 	icon_state = "banner-red"

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -23,8 +23,6 @@
 	new /obj/item/clothing/under/rank/command/captain/skirt(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace(src)
 	new /obj/item/clothing/head/caphat(src)
-	new /obj/item/clothing/under/rank/command/captain/parade(src)
-	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
 	new /obj/item/clothing/head/caphat/parade(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
 	new /obj/item/clothing/head/crown/fancy(src)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
@@ -1087,7 +1087,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		return
 	var/list/verblist = list()
 	var/list/verbstoprocess = verbs.Copy()
-	if(mob?.client?.prefs.broadcast_login_logout)
+	if(mob)
 		verbstoprocess += mob.verbs
 		for(var/atom/movable/thing as anything in mob.contents)
 			verbstoprocess += thing.verbs

diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
@@ -1,5 +1,4 @@
 //Jumpsuits
-//thgvr TODO: Make more stuff (backpacks, headsets, doodads, part 2?)
 /obj/item/clothing/under/gezena
 	name = "gezenan navywear"
 	desc = "Made of a slick synthetic material that is both breathable, and resistant to scale and thorn alike."