Stay Tuned

code/game/gamemodes/nuclear/nuclear.dm

@@ -241,59 +241,11 @@
 /datum/game_mode/proc/random_radio_frequency()
 	return 1337 // WHY??? -- Doohl
 
-///HEREHEREHERE
 /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob, uplink_uses = 100)
-	var/radio_freq = SYND_FREQ
-
-	var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob)
-	R.set_frequency(radio_freq)
-	synd_mob.equip_to_slot_or_del(R, slot_l_ear)
-
-	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform)
-	synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes)
-	synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves)
-	synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), slot_wear_id)
-	synd_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(synd_mob), slot_back)
-	synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), slot_belt)
-	synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival/syndicate(synd_mob.back), slot_in_backpack)
-	synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), slot_wear_pda)
-	var/obj/item/radio/uplink/nuclear/U = new /obj/item/radio/uplink/nuclear(synd_mob)
-	U.hidden_uplink.uplink_owner="[synd_mob.key]"
-	U.hidden_uplink.uses = uplink_uses
-	synd_mob.equip_to_slot_or_del(U, slot_in_backpack)
-
-	if(synd_mob.dna.species)
-
-		/*
-		Incase anyone ever gets the burning desire to have nukeops with randomized apperances. -- Dave
-		synd_mob.gender = pick(MALE, FEMALE) // Randomized appearances for the nukeops.
-		var/datum/preferences/pref = new()
-		A.randomize_appearance_for(synd_mob)
-		*/
-
-		var/race = synd_mob.dna.species.name
-
-		switch(race)
-			if("Vox", "Vox Armalis")
-				synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
-				synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), slot_l_hand)
-				synd_mob.internal = synd_mob.l_hand
-				synd_mob.update_action_buttons_icon()
-
-			if("Plasmaman")
-				synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
-				synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), slot_s_store)
-				synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
-				synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
-				synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store)
-				synd_mob.update_action_buttons_icon()
-
-	synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups
-	var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(synd_mob)
-	E.implant(synd_mob)
-	synd_mob.faction |= "syndicate"
-	synd_mob.update_icons()
-	return 1
+	synd_mob.equipOutfit(/datum/outfit/job/nuclear)
+	for(var/obj/item/radio/uplink/nuclear/U in synd_mob.back)
+		U.hidden_uplink.uses = uplink_uses
+	return TRUE
 
 /datum/game_mode/nuclear/check_win()
 	if(nukes_left == 0)

code/game/jobs/job/civilian.dm

@@ -7,8 +7,8 @@
 	supervisors = "the head of personnel"
 	department_head = list("Head of Personnel")
 	selection_color = "#dddddd"
-	access = list()			//See /datum/job/assistant/get_access()
-	minimal_access = list()	//See /datum/job/assistant/get_access()
+	access = list()			//See /datum/job/civilian/get_access()
+	minimal_access = list()	//See /datum/job/civilian/get_access()
 	alt_titles = list("Tourist","Businessman","Trader","Assistant")
 	random_money_factor = TRUE
 	outfit = /datum/outfit/job/assistant

code/game/jobs/job/syndicate.dm

@@ -58,3 +58,70 @@
 	H.mind?.offstation_role = TRUE
 	set_antag_hud(H.mind.current, "hudoperative")
 	H.regenerate_icons()
+
+/datum/outfit/job/nuclear
+	name = "Nuclear Operative"
+	allow_backbag_choice = FALSE
+	allow_loadout = FALSE
+	uniform = /obj/item/clothing/under/syndicate
+	shoes = /obj/item/clothing/shoes/combat
+	gloves = /obj/item/clothing/gloves/combat
+	id = /obj/item/card/id/syndicate
+	belt = /obj/item/gun/projectile/automatic/pistol
+	box = /obj/item/storage/box/survival/syndicate
+	pda = /obj/item/pinpointer/nukeop
+	l_ear = /obj/item/radio/headset/syndicate/alt
+	implants = list(/obj/item/implant/explosive)
+	backpack_contents = list(/obj/item/radio/uplink/nuclear)
+
+/datum/outfit/job/nuclear/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(visualsOnly)
+		return
+
+//	U.hidden_uplink.uplink_owner="[H.key]"
+
+	if(H.dna.species.name == "Plasmaman")
+		H.equip_or_collect(new /obj/item/extinguisher_refill(H), slot_in_backpack)
+		H.equip_or_collect(new /obj/item/extinguisher_refill(H), slot_in_backpack)
+
+	var/obj/item/radio/R = H.l_ear
+	if(istype(R))
+		R.set_frequency(SYND_FREQ)
+	H.faction |= "syndicate"
+
+/datum/outfit/job/infiltrator
+	name = "Syndicate Infiltrator"
+	allow_backbag_choice = FALSE
+	allow_loadout = FALSE
+	uniform = /obj/item/clothing/under/chameleon
+	gloves = /obj/item/clothing/gloves/combat
+			equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
+	belt = /obj/item/storage/belt/utility/full/multitool
+	implants = list(/obj/item/implant/dust, /obj/item/implant/uplink/sit)
+	l_ear = /obj/item/radio/headset/syndicate/syndteam
+	shoes = /obj/item/clothing/shoes/chameleon/noslip
+	id = /obj/item/card/id/syndicate
+
+/datum/outfit/job/infiltrator/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+
+	if(visualsOnly)
+		return
+	if(flag_mgmt)
+		U.hidden_uplink.uses = 2500
+	else
+		U.hidden_uplink.uses = num_tc
+
+	var/obj/item/clothing/gloves/G = H.gloves
+	if(istype(G))
+		G.name = "black gloves"
+		G.icon_state = "black"
+
+	var/obj/item/radio/R = H.l_ear
+	if(istype(R))
+		R.set_frequency(SYNDTEAM_FREQ)
+
+	var/obj/item/card/id/I = H.wear_id
+	if(istype(I))
+		apply_to_card(I, H, list(ACCESS_SYNDICATE,ACCESS_MAINT_TUNNELS,ACCESS_EXTERNAL_AIRLOCKS,ACCESS_MEDICAL,ACCESS_ENGINE,ACCESS_CARGO,ACCESS_RESEARCH), "Civilian", "id")

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

@@ -62,6 +62,7 @@
 	max_combined_w_class = 35
 	resistance_flags = FIRE_PROOF
 	flags_2 = NO_MAT_REDEMPTION_2
+	w_class_override = list(/obj/item/storage)
 	cant_hold = list(/obj/item/storage/backpack/holding)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
 

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

@@ -342,6 +342,11 @@
 				to_chat(usr, "<span class='notice'>[W] is too small for [src].</span>")
 			return FALSE
 
+		if(W.w_class >= w_class && (istype(W, /obj/item/storage)))
+			if(!stop_messages)
+				to_chat(usr, "<span class='notice'>[src] cannot hold [W] as it's a storage item of the same size.</span>")
+			return FALSE //To prevent the stacking of same sized storage items.
+
 	var/sum_w_class = W.w_class
 	for(var/obj/item/I in contents)
 		sum_w_class += I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
@@ -351,12 +356,6 @@
 			to_chat(usr, "<span class='notice'>[src] is full, make some space.</span>")
 		return FALSE
 
-	if(W.w_class >= w_class && (istype(W, /obj/item/storage)))
-		if(!istype(src, /obj/item/storage/backpack/holding))	//bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm.
-			if(!stop_messages)
-				to_chat(usr, "<span class='notice'>[src] cannot hold [W] as it's a storage item of the same size.</span>")
-			return FALSE //To prevent the stacking of same sized storage items.
-
 	if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry.
 		to_chat(usr, "<span class='notice'>\the [W] is stuck to your hand, you can't put it in \the [src]</span>")
 		return FALSE

code/modules/admin/verbs/honksquad.dm

@@ -99,46 +99,12 @@ GLOBAL_VAR_INIT(sent_clownsequritysquad, 0)
 	new_honksquad.mind.offstation_role = TRUE
 	new_honksquad.add_language("Clownish")
 	SSticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list.
-	new_honksquad.equip_honksquad(honk_leader_selected, rankName)
+	new_honksquad.equipOutfit(/datum/outfit/job/honksquad)
+	var/obj/item/card/id/I = new_honksquad.wear_id
+	if(istype(I))
+		apply_to_card(I, new_honksquad, list(ACCESS_CLOWN), "HONKsquad", "clownsquad")
+		I.assignment = "[rankName] ХОНК-отряда"
 	return new_honksquad
-//HEREHEREHERE
-/mob/living/carbon/human/proc/equip_honksquad(honk_leader_selected = 0, var/rankName)
-
-	var/obj/item/radio/R = new /obj/item/radio/headset(src)
-	R.set_frequency(1442)
-	equip_to_slot_or_del(R, slot_l_ear)
-	equip_to_slot_or_del(new /obj/item/storage/backpack/clown(src), slot_back)
-	equip_to_slot_or_del(new /obj/item/storage/box/survival/regular(src), slot_in_backpack)
-	if(src.gender == FEMALE)
-		equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat/sexy(src), slot_wear_mask)
-		equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown/sexy(src), slot_w_uniform)
-	else
-		equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
-		equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
-	equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
-	equip_to_slot_or_del(new /obj/item/pda/clown(src), slot_wear_pda)
-	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
-	equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/banana(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/bikehorn(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/clown_recorder(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/stamp/clown(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/reagent_containers/spray/waterflower(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/reagent_containers/food/pill/patch/jestosterone(src), slot_r_store)
-	if(prob(50))
-		equip_to_slot_or_del(new /obj/item/gun/energy/clown(src), slot_in_backpack)
-	else
-		equip_to_slot_or_del(new /obj/item/gun/throw/piecannon(src), slot_in_backpack)
-	src.mutations.Add(CLUMSY)
-	var/obj/item/implant/sad_trombone/S = new/obj/item/implant/sad_trombone(src)
-	S.implant(src)
-
-	var/obj/item/card/id/I = new(src)
-	apply_to_card(I, src, list(ACCESS_CLOWN), "HONKsquad", "clownsquad")
-	I.assignment = "[rankName] ХОНК-отряда"
-	equip_to_slot_or_del(I, slot_wear_id)
-
-	return TRUE
 
 /client/proc/create_honksquad_security(obj/spawn_location, honk_leader_selected = 0)
 	var/mob/living/carbon/human/new_honksquad = new(spawn_location.loc)

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -109,7 +109,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
 
 // ---------------------------------------------------------------------------------------------------------
 
-/client/proc/create_syndicate_infiltrator(obj/spawn_location, syndicate_leader_selected = 0, uplink_tc = 20, is_mgmt = 0)
+/client/proc/create_syndicate_infiltrator(obj/spawn_location, syndicate_leader_selected = 0, uplink_tc, is_mgmt = 0)
 	var/mob/living/carbon/human/new_syndicate_infiltrator = new(spawn_location.loc)
 
 	var/syndicate_infiltrator_name = random_name(pick(MALE,FEMALE))
@@ -129,59 +129,18 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
 	return new_syndicate_infiltrator
 
 // ---------------------------------------------------------------------------------------------------------
-///HEREHEREHERE
-/mob/living/carbon/human/proc/equip_syndicate_infiltrator(syndicate_leader_selected = 0, num_tc, flag_mgmt)
-	// Storage items
-	equip_to_slot_or_del(new /obj/item/storage/backpack(src), slot_back)
-	equip_to_slot_or_del(new /obj/item/storage/box/survival/regular(src), slot_in_backpack)
-	equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), slot_w_uniform)
-	if(!flag_mgmt)
-		equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
-		equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), slot_belt)
-
-	var/obj/item/clothing/gloves/combat/G = new /obj/item/clothing/gloves/combat(src)
-	G.name = "black gloves"
-	equip_to_slot_or_del(G, slot_gloves)
-
-	// Implants:
-	// Uplink
-	var/obj/item/implant/uplink/sit/U = new /obj/item/implant/uplink/sit(src)
-	U.implant(src)
-	if (flag_mgmt)
-		U.hidden_uplink.uses = 2500
-	else
-		U.hidden_uplink.uses = num_tc
-	// Dust
-	var/obj/item/implant/dust/D = new /obj/item/implant/dust(src)
-	D.implant(src)
-
-	// Radio & PDA
-	var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/syndteam(src)
-	R.set_frequency(SYNDTEAM_FREQ)
-	equip_to_slot_or_del(R, slot_l_ear)
-	equip_or_collect(new /obj/item/pda(src), slot_in_backpack)
-
-	// Other gear
-	equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), slot_shoes)
-
-	var/obj/item/card/id/syndicate/W = new(src)
-	if (flag_mgmt)
-		W.icon_state = "commander"
-	else
-		W.icon_state = "id"
-	W.access = list(ACCESS_MAINT_TUNNELS,ACCESS_EXTERNAL_AIRLOCKS)
-	W.assignment = "Civilian"
-	W.access += get_access("Civilian")
-	W.access += list(ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_RESEARCH)
-	if(flag_mgmt)
-		W.assignment = "Syndicate Management Consultant"
-		W.access += get_syndicate_access("Syndicate Commando")
-	else if(syndicate_leader_selected)
-		W.access += get_syndicate_access("Syndicate Commando")
-	else
-		W.access += get_syndicate_access("Syndicate Operative")
-	W.name = "[real_name]'s ID Card ([W.assignment])"
-	W.registered_name = real_name
-	equip_to_slot_or_del(W, slot_wear_id)
 
-	return 1
+/mob/living/carbon/human/proc/equip_syndicate_infiltrator(syndicate_leader_selected = 0, num_tc, flag_mgmt)
+	for(var/obj/item/implant/uplink/sit/U in src)
+		if(num_tc)
+			U.hidden_uplink.uses = num_tc
+		else if(flag_mgmt)
+			U.hidden_uplink.uses = 2500
+
+	if(flag_mgmt || syndicate_leader_selected)
+		var/obj/item/card/id/I = wear_id
+		if(istype(I))
+			apply_to_card(I, src, list(ACCESS_SYNDICATE_LEADER,ACCESS_SYNDICATE_COMMS_OFFICER,ACCESS_SYNDICATE_RESEARCH_DIRECTOR,ACCESS_SYNDICATE_SCIENTIST,	\
+									ACCESS_SYNDICATE_CARGO,ACCESS_SYNDICATE_KITCHEN,ACCESS_SYNDICATE_MEDICAL,ACCESS_SYNDICATE_BOTANY,ACCESS_SYNDICATE_ENGINE,	\
+									ACCESS_MAINT_TUNNELS,ACCESS_EXTERNAL_AIRLOCKS,ACCESS_MEDICAL,ACCESS_ENGINE,ACCESS_CARGO,ACCESS_RESEARCH),  flag_mgmt ? "Syndicate Management Consultant" : name, flag_mgmt ? "commander" : special_icon)
+	return TRUE

code/modules/response_team/ert_outfits.dm

@@ -674,3 +674,48 @@
 		/obj/item/implant/mindshield/ert,
 		/obj/item/implant/death_alarm
 	)
+
+//////////////////// HONK MOTHERFUKA ///////////////////
+
+/datum/outfit/job/honksquad
+	name = "HONKsquad Commando"
+	allow_backbag_choice = FALSE
+	allow_loadout = FALSE
+	back = /obj/item/storage/backpack/clown
+	uniform = /obj/item/clothing/under/rank/clown
+	mask = /obj/item/clothing/mask/gas/clown_hat
+	shoes = /obj/item/clothing/shoes/clown_shoes
+	pda = /obj/item/pda/clown
+	r_pocket = /obj/item/reagent_containers/food/pill/patch/jestosterone
+	backpack_contents = list(
+		/obj/item/storage/box/survival/regular,
+		/obj/item/reagent_containers/food/snacks/grown/banana,
+		/obj/item/bikehorn,
+		/obj/item/clown_recorder,
+		/obj/item/stamp/clown,
+		/obj/item/toy/crayon/rainbow,
+		/obj/item/reagent_containers/spray/waterflower
+	)
+	implants = list(/obj/item/implant/sad_trombone)
+
+/datum/outfit/job/honksquad/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	if(H.gender == FEMALE)
+		mask = /obj/item/clothing/mask/gas/clown_hat/sexy
+		uniform = /obj/item/clothing/under/rank/clown/sexy
+
+	if(prob(50))
+		backpack_contents += /obj/item/gun/energy/clown
+	else
+		backpack_contents += /obj/item/gun/throw/piecannon(src)
+
+/datum/outfit/job/honksquad/post_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+
+	if(visualsOnly)
+		return
+
+	var/obj/item/radio/R = H.l_ear
+	if(istype(R))
+		R.set_frequency(1442)
+	H.mutations.Add(CLUMSY)