Merge branch 'master' into thrown

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -35,7 +35,6 @@
 /area/ruin/wasteplanet)
 "bL" = (
 /obj/structure/fluff/divine/convertaltar,
-/obj/item/nullrod/tribal_knife,
 /obj/item/clothing/accessory/pandora_hope,
 /turf/open/indestructible/hierophant/two/waste,
 /area/ruin/wasteplanet)

_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
 		}
 	},

_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" = (

_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{

_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,

_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" = (

_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{

code/__DEFINES/sight.dm

@@ -13,6 +13,8 @@
 #define INVISIBILITY_OBSERVER 60
 #define SEE_INVISIBLE_OBSERVER 60
 
+#define INVISIBILITY_INVINISMIN 80 //invisible admins
+
 #define INVISIBILITY_MAXIMUM 100 //the maximum allowed for "real" objects
 
 #define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.

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,

code/game/objects/items/devices/radio/headset.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	custom_materials = list(/datum/material/iron=75)
 	subspace_transmission = TRUE
 	headset = TRUE
+	listening = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 
 	slot_flags = ITEM_SLOT_EARS

code/game/objects/items/devices/radio/intercom.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "intercom"
 	anchored = TRUE
+	listening = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	canhear_range = 2
 	dog_fashion = null

code/game/objects/items/holy_weapons.dm

@@ -671,33 +671,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 
-/obj/item/nullrod/tribal_knife
-	icon_state = "crysknife"
-	item_state = "crysknife"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	name = "arrhythmic knife"
-	w_class = WEIGHT_CLASS_HUGE
-	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	sharpness = IS_SHARP
-	slot_flags = null
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/nullrod/tribal_knife/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 100)
-
-/obj/item/nullrod/tribal_knife/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/nullrod/tribal_knife/process()
-	slowdown = rand(-2, 2)
-
-
 /obj/item/nullrod/pitchfork
 	icon_state = "pitchfork0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'

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"

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)

code/game/objects/structures/crates_lockers/crates/secure.dm

@@ -105,7 +105,7 @@
 	else ..()
 
 /obj/structure/closet/crate/secure/exo
-	desc = "A lock-enabled crate used to carry EXOCON merchandise destined for export to potential buyers."
-	name = "EXOCON storage crate"
+	desc = "A lock-enabled crate used to carry EXOCOM merchandise destined for export to potential buyers."
+	name = "EXOCOM storage crate"
 	icon = 'icons/obj/crates.dmi'
 	icon_state = "exocrate"

code/modules/admin/admin_verbs.dm

@@ -403,11 +403,13 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	set category = "Admin.Game"
 	set desc = "Toggles ghost-like invisibility (Don't abuse this)"
 	if(holder && mob)
-		if(mob.invisibility == INVISIBILITY_OBSERVER)
+		if(mob.invisibility == INVISIBILITY_INVINISMIN)
 			mob.invisibility = initial(mob.invisibility)
+			mob.remove_from_all_data_huds()
 			to_chat(mob, "<span class='boldannounce'>Invisimin off. Invisibility reset.</span>", confidential = TRUE)
 		else
-			mob.invisibility = INVISIBILITY_OBSERVER
+			mob.invisibility = INVISIBILITY_INVINISMIN
+			mob.add_to_all_human_data_huds()
 			to_chat(mob, "<span class='adminnotice'><b>Invisimin on. You are now as invisible as a ghost.</b></span>", confidential = TRUE)
 
 /client/proc/check_antagonists()

code/modules/cargo/packs/gun.dm

@@ -30,6 +30,12 @@
 	contains = list(/obj/item/gun/ballistic/automatic/pistol,
 					/obj/item/gun/ballistic/automatic/pistol)
 
+/datum/supply_pack/gun/candors
+	name = "Candor Pistol Crate"
+	desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
+	cost = 1000
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)
+
 /datum/supply_pack/gun/revolver
 	name = "Scarborough Revolver Crate"
 	desc = "Contains a concealable Scarborough revolver, chambered in .357."
@@ -39,7 +45,7 @@
 /datum/supply_pack/gun/detrevolver
 	name = "Hunter's Pride Detective Revolver Crate"
 	desc = "Contains a concealable Solarian revolver, chambered in .38."
-	cost = 1000
+	cost = 600
 	contains = list(/obj/item/gun/ballistic/revolver/detective)
 
 /datum/supply_pack/gun/shadowrevolver

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

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."