Merge pull request #10253 from Kyep/cc_contraband

CC/Admin Outfits Update

code/game/gamemodes/nuclear/pinpointer.dm

@@ -391,3 +391,12 @@
 
 /obj/item/pinpointer/crew/examine(mob/user)
 	..(user)
+
+/obj/item/pinpointer/crew/centcom
+	name = "centcom pinpointer"
+	desc = "A handheld tracking device that tracks crew based on remote centcom sensors."
+
+/obj/item/pinpointer/crew/centcom/trackable(mob/living/carbon/human/H)
+	var/turf/here = get_turf(src)
+	var/turf/there = get_turf(H)
+	return there && there.z == here.z

code/game/gamemodes/vampire/vampire_powers.dm

@@ -535,3 +535,73 @@
 
 /datum/vampire_passive/full
 	gain_desc = "You have reached your full potential and are no longer weak to the effects of anything holy and your vision has been improved greatly."
+
+
+/obj/effect/proc_holder/spell/targeted/raise_vampires
+	name = "Raise Vampires"
+	desc = "Summons deadly vampires from bluespace."
+	school = "transmutation"
+	charge_max = 100
+	clothes_req = 0
+	human_req = 1
+	invocation = "none"
+	invocation_type = "none"
+	max_targets = 0
+	range = 3
+	cooldown_min = 20
+	action_icon_state = "revive_thrall"
+	sound = 'sound/magic/WandODeath.ogg'
+
+/obj/effect/proc_holder/spell/targeted/raise_vampires/cast(list/targets, mob/user = usr)
+	new /obj/effect/temp_visual/cult/sparks(user.loc)
+	var/turf/T = get_turf(user)
+	to_chat(user, "<span class='warning'>You call out within bluespace, summoning more vampiric spirits to aid you!</span>")
+	for(var/mob/living/carbon/human/H in targets)
+		T.Beam(H, "sendbeam", 'icons/effects/effects.dmi', time=30, maxdistance=7, beam_type=/obj/effect/ebeam)
+		new /obj/effect/temp_visual/cult/sparks(H.loc)
+		H.raise_vampire(user)
+
+
+/mob/living/carbon/human/proc/raise_vampire(var/mob/M)
+	if(!istype(M))
+		log_debug("human/proc/raise_vampire called with invalid argument.")
+		return
+	if(!mind)
+		visible_message("[src] looks to be too stupid to understand what is going on.")
+		return
+	if(dna && (NO_BLOOD in dna.species.species_traits) || dna.species.exotic_blood || !blood_volume)
+		visible_message("[src] looks unfazed!")
+		return
+	if(mind.vampire || mind.special_role == SPECIAL_ROLE_VAMPIRE || mind.special_role == SPECIAL_ROLE_VAMPIRE_THRALL)
+		visible_message("<span class='notice'>[src] looks refreshed!</span>")
+		adjustBruteLoss(-60)
+		adjustFireLoss(-60)
+		for(var/obj/item/organ/external/E in bodyparts)
+			if(prob(25))
+				if(E.mend_fracture())
+					E.perma_injury = 0
+		return
+	if(stat != DEAD)
+		if(weakened)
+			visible_message("<span class='warning'>[src] looks to be in pain!</span>")
+			adjustBrainLoss(60)
+		else
+			visible_message("<span class='warning'>[src] looks to be stunned by the energy!</span>")
+			Weaken(20)
+		return
+	for(var/obj/item/implant/mindshield/L in src)
+		if(L && L.implanted)
+			qdel(L)
+	for(var/obj/item/implant/traitor/T in src)
+		if(T && T.implanted)
+			qdel(T)
+	visible_message("<span class='warning'>[src] gets an eerie red glow in their eyes!</span>")
+	var/datum/objective/protect/protect_objective = new
+	protect_objective.owner = mind
+	protect_objective.target = M.mind
+	protect_objective.explanation_text = "Protect [M.real_name]."
+	mind.objectives += protect_objective
+	add_attack_logs(M, src, "Vampire-sired")
+	mind.make_Vampire()
+	revive()
+	Weaken(20)

code/game/jobs/access.dm

@@ -84,7 +84,7 @@
 /var/const/access_cent_storage = 105//Storage areas.
 /var/const/access_cent_shuttles = 106//Shuttle docks.
 /var/const/access_cent_telecomms = 107//Telecomms.
-/var/const/access_cent_teleporter = 108//Telecomms.
+/var/const/access_cent_teleporter = 108//Teleporter
 /var/const/access_cent_specops = 109//Special Ops.
 /var/const/access_cent_specops_commander = 110//Special Ops Commander.
 /var/const/access_cent_blackops = 111//Black Ops.
@@ -207,6 +207,8 @@ var/const/access_trade_sol = 160
 			return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_specops, access_cent_specops_commander, access_cent_blackops) + get_all_accesses()
 		if("Deathsquad Officer")
 			return get_all_centcom_access() + get_all_accesses()
+		if("NT Undercover Operative")
+			return get_all_centcom_access() + get_all_accesses()
 		if("Special Operations Officer")
 			return get_all_centcom_access() + get_all_accesses()
 		if("Nanotrasen Navy Representative")
@@ -224,6 +226,8 @@ var/const/access_trade_sol = 160
 			return list(access_syndicate)
 		if("Syndicate Operative Leader")
 			return list(access_syndicate, access_syndicate_leader)
+		if("Syndicate Agent")
+			return list(access_syndicate, access_maint_tunnels)
 		if("Vox Raider")
 			return list(access_vox)
 		if("Vox Trader")

code/game/jobs/job/central.dm

@@ -35,7 +35,9 @@
 	)
 	backpack = /obj/item/storage/backpack/satchel
 	box = /obj/item/storage/box/centcomofficer
-
+	cybernetic_implants = list(
+		/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+	)
 
 // CC Officials who lead ERTs, Death Squads, etc.
 /datum/job/ntspecops
@@ -61,7 +63,7 @@
 	uniform = /obj/item/clothing/under/rank/centcom_commander
 	suit = /obj/item/clothing/suit/space/deathsquad/officer
 	back = /obj/item/storage/backpack/security
-	belt = /obj/item/gun/energy/pulse/pistol/m1911
+	belt = /obj/item/storage/belt/military/assault
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
 	mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
@@ -75,7 +77,6 @@
 	backpack = /obj/item/storage/backpack/satchel
 	backpack_contents = list(
 		/obj/item/clothing/shoes/magboots/advance = 1,
-		/obj/item/twohanded/dualsaber/red = 1,
 		/obj/item/storage/box/zipties = 1
 	)
 	implants = list(
@@ -86,5 +87,6 @@
 		/obj/item/organ/internal/cyberimp/eyes/xray,
 		/obj/item/organ/internal/cyberimp/brain/anti_drop,
 		/obj/item/organ/internal/cyberimp/brain/anti_stun,
-		/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+		/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+		/obj/item/organ/internal/cyberimp/arm/combat/centcom
 	)

code/game/objects/items/weapons/storage/boxes.dm

@@ -879,7 +879,9 @@
 /obj/item/storage/box/centcomofficer
 	name = "officer kit"
 	icon_state = "box_ert"
-	
+	storage_slots = 14
+	max_combined_w_class = 20
+
 /obj/item/storage/box/centcomofficer/New()
 	..()
 	contents = list()
@@ -893,7 +895,8 @@
 	new /obj/item/implanter/death_alarm(src)
 
 	new /obj/item/reagent_containers/hypospray/combat/nanites(src)
-	new /obj/item/pinpointer/advpinpointer(src)
+	new /obj/item/pinpointer(src)
+	new /obj/item/pinpointer/crew/centcom(src)
 
 /obj/item/storage/box/responseteam
 	name = "boxed survival kit"

code/game/objects/items/weapons/storage/secure.dm

@@ -214,14 +214,6 @@
 	for(var/i = 0, i < storage_slots - 2, i++)
 		handle_item_insertion(new /obj/item/stack/spacecash/c1000, 1)
 
-/obj/item/storage/secure/briefcase/reaper/New()
-	..()
-	handle_item_insertion(new /obj/item/gun/energy/kinetic_accelerator/crossbow, 1)
-	handle_item_insertion(new /obj/item/gun/projectile/revolver/mateba, 1)
-	handle_item_insertion(new /obj/item/ammo_box/a357, 1)
-	handle_item_insertion(new /obj/item/grenade/plastic/c4, 1)
-
-
 // -----------------------------
 //        Secure Safe
 // -----------------------------