Clothing adding v0.7

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -85,39 +85,19 @@
 	icon_state = "paramed"
 	req_access = list(ACCESS_PARAMEDIC)
 
+/*	dripstation edit
 /obj/structure/closet/secure_closet/paramedic/PopulateContents()
 	..()
-	if(prob(50))
-		new /obj/item/storage/backpack/medic(src)
-	else
-		new /obj/item/storage/backpack/satchel/med(src)
-	new /obj/item/storage/firstaid/hypospray/paramedic(src)
-	new /obj/item/clothing/shoes/sneakers/white(src)
-	switch(pick("blue", "green", "purple"))
-		if ("blue")
-			new /obj/item/clothing/under/rank/medical/doctor/blue(src)
-		if ("green")
-			new /obj/item/clothing/under/rank/medical/doctor/green(src)
-		if ("purple")
-			new /obj/item/clothing/under/rank/medical/doctor/purple(src)
-	switch(pick("blue", "green", "purple"))
-		if ("blue")
-			new /obj/item/clothing/under/rank/medical/doctor/blue(src)
-		if ("green")
-			new /obj/item/clothing/under/rank/medical/doctor/green(src)
-		if ("purple")
-			new /obj/item/clothing/under/rank/medical/doctor/purple(src)
-	new /obj/item/clothing/under/rank/medical(src)
-	new /obj/item/clothing/suit/toggle/labcoat/emt(src)
-	new /obj/item/clothing/head/beret/emt/green(src)
-	new /obj/item/clothing/head/beret/emt(src)
-	new /obj/item/clothing/head/soft/emt(src)
+	new /obj/item/clothing/shoes/sneakers/white(src) //shoes and a jumpsuit in case something goes wrong, otherwise clothes are just in vendor
+	new /obj/item/clothing/under/rank/medical/doctor(src)
 	new /obj/item/defibrillator/loaded(src)
-	new /obj/item/clothing/suit/toggle/labcoat/emt/green(src)
-	new /obj/item/clothing/head/soft/emt/green (src)
+	new /obj/item/storage/firstaid/hypospray/paramedic(src)
 	new /obj/item/radio/headset/headset_med(src)
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
+	new /obj/item/clothing/glasses/hud/health(src)
+	new /obj/item/roller(src)
+*/
 
 /obj/structure/closet/secure_closet/mmedical
 	name = "mining medic's locker"
@@ -199,6 +179,7 @@
 	req_access = list(ACCESS_PSYCH)
 	icon_state = "cabinet"
 
+/*	dripstation edit
 /obj/structure/closet/secure_closet/psych/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/straight_jacket(src)
@@ -210,3 +191,4 @@
 	new /obj/item/storage/pill_bottle/psicodine(src)
 	new /obj/item/assembly/flash(src)
 	new /obj/item/assembly/flash(src)
+*/

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -174,6 +174,7 @@
 	max_integrity = 70
 	door_anim_time = 0 // no animation
 
+/*	//dripstation edit
 /obj/structure/closet/secure_closet/detective/PopulateContents()
 	..()
 	new /obj/item/storage/box/evidence(src)
@@ -188,6 +189,7 @@
 	new /obj/item/binoculars(src)
 	new /obj/item/storage/backpack/duffelbag/clothing/sec/detective(src)
 	new /obj/item/barrier_taperoll/police(src)
+*/
 
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"
@@ -319,6 +321,7 @@
 	max_integrity = 70
 	door_anim_time = 0
 
+/*	//dripstation edit
 /obj/structure/closet/secure_closet/physician/PopulateContents()
 	..()
 	new /obj/item/storage/backpack/duffelbag/clothing/sec/physician(src)
@@ -331,3 +334,4 @@
 	new /obj/item/clothing/mask/breath/medical(src)
 	new /obj/item/defibrillator/loaded(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile
+*/

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -6,6 +6,7 @@
 /obj/structure/closet/syndicate/personal
 	desc = "It's a personal storage unit for operative gear."
 
+/* Dripstation edit, check modular_dripstation\code\game\objects\structures\crates_lockers\closets.dm
 /obj/structure/closet/syndicate/personal/PopulateContents()
 	..()
 	new /obj/item/clothing/under/syndicate(src)
@@ -15,6 +16,7 @@
 	new /obj/item/storage/belt/military(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/clothing/glasses/night(src)
+*/
 
 /obj/structure/closet/syndicate/nuclear
 	desc = "It's a storage unit for a Syndicate boarding party."

code/game/turfs/turf.dm

@@ -710,7 +710,11 @@ GLOBAL_LIST_EMPTY(station_turfs)
 /turf/handle_fall(mob/faller)
 	if(has_gravity(src))
 		playsound(src, "bodyfall", 50, 1)
+	/*	dripstation edit
 	faller.drop_all_held_items()
+	*/
+	if(!HAS_TRAIT(faller, TRAIT_STRONG_GRIP))		//dripstation edit
+		faller.drop_all_held_items()		//dripstation edit
 
 /turf/proc/photograph(limit=20)
 	var/image/I = new()

code/modules/antagonists/devil/devil_helpers.dm

@@ -18,7 +18,10 @@
 						/obj/item/clothing/under/rank/medical/virologist = 1,
 						/obj/item/clothing/under/rank/medical/nursesuit = 1,
 						/obj/item/clothing/under/rank/medical = 1,
+						/* Dripstation edit
 						/obj/item/clothing/under/rank/det = 1,
+						*/
+						/obj/item/clothing/under/rank/security/detective = 1,
 						/obj/item/clothing/under/suit/white = 0.5,
 						/obj/item/clothing/under/rank/civilian/chaplain/burial = 1
 					)

code/modules/cargo/packs.dm

@@ -317,6 +317,7 @@
 					/obj/item/toy/crayon/white,
 					/obj/item/clothing/head/fedora/det_hat)
 	crate_name = "forensics crate"
+
 /*
 /datum/supply_pack/security/laser
 	name = "Lasers Crate"
@@ -327,6 +328,7 @@
 					/obj/item/gun/energy/laser)
 	crate_name = "laser crate"
 */
+
 /datum/supply_pack/security/secfiringpins
 	name = "Mindshield Firing Pins Crate"
 	desc = "Upgrade your arsenal with 10 mindshield firing pins. Requires Security access to open."
@@ -1733,6 +1735,36 @@
 					/obj/item/vending_refill/wallhypo)
 	crate_name = "medical vending crate"
 
+//DRIPSTATION
+/datum/supply_pack/medical/gloves
+	name = "Nitrile Gloves Crate"
+	desc = "Contains one pair of pricy nitrile gloves."
+	cost = 1000
+	small_item = TRUE
+	contains = list(/obj/item/clothing/gloves/color/latex/nitrile)
+
+/datum/supply_pack/costumes_toys/randomised/sunglasses
+	name = "Eye Protection Crate"
+	desc = "Contains one pair of pricy real eye protection."
+	contraband = TRUE
+	cost = 700
+	num_contained = 1
+	small_item = TRUE
+	contains = list(/obj/item/clothing/glasses/sunglasses,
+					/obj/item/clothing/glasses/sunglasses,
+					/obj/item/clothing/glasses/sunglasses,
+					/obj/item/clothing/glasses/sunglasses/aviators)
+
+/datum/supply_pack/security/armory/sunglasses
+	name = "Sunglasses Crate"
+	desc = "Contains three pairs of pricy real sunglasses."
+	cost = 1500
+	contains = list(/obj/item/clothing/glasses/sunglasses,
+					/obj/item/clothing/glasses/sunglasses,
+					/obj/item/clothing/glasses/sunglasses)
+	crate_name = "sunglasses crate"
+//DRIPSTATION
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Science /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

code/modules/clothing/neck/_neck.dm

@@ -173,6 +173,7 @@
 	icon_state = "stripedbluescarf"
 	custom_price = 10
 
+/* Dripstation edit
 /obj/item/clothing/neck/petcollar
 	name = "pet collar"
 	desc = "It has a little bell!"
@@ -191,6 +192,7 @@
 /obj/item/clothing/neck/petcollar/attack_self(mob/user)
 	tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
 	name = "[initial(name)] - [tagname]"
+Dripstation edit */
 
 /obj/item/clothing/neck/artist
 	name = "post-modern scarf"

code/modules/clothing/outfits/standard.dm

@@ -27,7 +27,10 @@
 /datum/outfit/tournament/gangster
 	name = "tournament gangster"
 
+	/* Dripstation Edit
 	uniform = /obj/item/clothing/under/rank/det
+	*/
+	uniform = /obj/item/clothing/under/rank/security/detective	// Dripstation Edit
 	suit = /obj/item/clothing/suit/det_suit
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	head = /obj/item/clothing/head/fedora/det_hat

code/modules/jobs/job_types/detective.dm

@@ -65,7 +65,9 @@
 	pda_type = /obj/item/modular_computer/tablet/pda/preset/security/detective
 
 	ears = /obj/item/radio/headset/headset_sec/alt
+	/* Dripstation edit
 	uniform = /obj/item/clothing/under/rank/det
+	*/
 	uniform_skirt = /obj/item/clothing/under/rank/security/detective/skirt
 	neck = /obj/item/clothing/neck/tie/detective
 	shoes = /obj/item/clothing/shoes/sneakers/brown

code/modules/mob/living/simple_animal/friendly/pet.dm

@@ -99,8 +99,12 @@
 /mob/living/simple_animal/pet/regenerate_icons()
 	cut_overlays()
 	if(pcollar && collar_type)
+/* Dripstation edit
 		add_overlay("[collar_type]collar")
 		add_overlay("[collar_type]tag")
+*/
+		add_overlay(mutable_appearance('modular_dripstation/icons/mob/pet.dmi', "[collar_type]collar[pcollar.collar]"))
+		add_overlay(mutable_appearance('modular_dripstation/icons/mob/pet.dmi', "[collar_type]tag[pcollar.tagtype]"))
 
 /mob/living/simple_animal/pet/proc/wuv(mob/M, change = TRUE)
 	if(change)

modular_dripstation/code/game/gamemodes/nuclear/nuclear.dm

@@ -12,11 +12,35 @@
 	justanop.teach(H)
 
 /datum/outfit/syndicate/full
+	suit = /obj/item/clothing/suit/space/hardsuit/syndi/bloodred
+	belt = /obj/item/storage/belt/military/webbing/syndicate/gorlex
+	back = /obj/item/storage/backpack/syndie
 	backpack_contents = list(/obj/item/storage/box/syndie/nuke=1,\
 		/obj/item/tank/jetpack/oxygen/harness=1,\
 		/obj/item/gun/ballistic/automatic/pistol=1,\
 		/obj/item/kitchen/knife/combat/survival)
 
+/datum/antagonist/nukeop/lone/equip_op()
+	if(!ishuman(owner.current))
+		return
+	var/mob/living/carbon/human/H = owner.current
+
+	H.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs
+
+	H.equipOutfit(nukeop_outfit)
+	var/obj/item/clothing/head/helmet/space/hardsuit/syndi/HE = H.get_item_by_slot(ITEM_SLOT_HEAD)
+	if(istype(HE, /obj/item/clothing/head/helmet/space/hardsuit/syndi))
+		HE.spaceready(H)
+	return TRUE
+
+/datum/outfit/nuclear_operative
+	suit = /obj/item/clothing/suit/space/hardsuit/syndi/bloodred/preview
+	head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/bloodred/preview
+
+/datum/outfit/nuclear_operative_elite
+	suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/preview
+	head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/preview
+
 /datum/outfit/syndicate/no_crystals
 	var/faction = "The Syndicate"
 

modular_dripstation/code/game/machinery/suit_storage_unit.dm

@@ -70,6 +70,13 @@
 	magboots_type = /obj/item/clothing/shoes/magboots/security
 	department = "sec"	
 
+/obj/machinery/suit_storage_unit/warden
+	suit_type = /obj/item/clothing/suit/space/hardsuit/security/warden
+	mask_type = /obj/item/clothing/mask/gas/sechailer
+	tank_type = /obj/item/tank/internals/oxygen/red
+	magboots_type = /obj/item/clothing/shoes/magboots/security
+	department = "sec"	
+
 /obj/machinery/suit_storage_unit/hos
 	suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
 	mask_type = /obj/item/clothing/mask/gas/sechailer
@@ -87,6 +94,16 @@
 	mask_type = /obj/item/clothing/mask/gas/explorer
 	department = "cargo"
 
+/obj/machinery/suit_storage_unit/mining/winter
+	suit_type = /obj/item/clothing/suit/hooded/explorer/winter
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	department = "cargo"
+
+/obj/machinery/suit_storage_unit/mining/medic
+	suit_type = /obj/item/clothing/suit/hooded/miningmedic
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	department = "med"
+
 /obj/machinery/suit_storage_unit/miningdualmod
 	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/mining
 	mask_type = /obj/item/clothing/mask/gas/explorer
@@ -168,6 +185,18 @@
 	tank_type = /obj/item/tank/jetpack/oxygen/harness
 	department = "synd"	
 
+/obj/machinery/suit_storage_unit/syndicate/engi
+	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/engineering/syndicate
+	mask_type = /obj/item/clothing/mask/gas/syndicate
+	tank_type = /obj/item/tank/jetpack/oxygen/harness
+	department = "synd"	
+
+/obj/machinery/suit_storage_unit/syndicate/winter/engi
+	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/engineering/syndicate/winter
+	mask_type = /obj/item/clothing/mask/gas/syndicate
+	tank_type = /obj/item/tank/jetpack/oxygen/harness
+	department = "synd"	
+
 /obj/machinery/suit_storage_unit/syndicate/donk
 	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
 	mask_type = /obj/item/clothing/mask/gas/syndicate

modular_dripstation/code/game/objects/items/card_ids.dm

@@ -174,3 +174,6 @@
 
 /obj/item/card/id/ert/clown
 	icon_state = "ERT_clown"
+
+/obj/item/card/id/makeshift
+	icon = 'modular_dripstation/icons/obj/card.dmi'

modular_dripstation/code/game/objects/items/devices/radio/encryptionkey.dm

@@ -11,3 +11,12 @@
 	icon_state = "qm_cypherkey"
 	channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_COMMAND = 1)
 
+/obj/item/encryptionkey/heads/procedure
+	name = "\proper the procedure encryption key"
+	icon_state = "proc_cypherkey"
+	channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_SERVICE = 1)
+
+/obj/item/encryptionkey/heads/bshield
+	name = "\proper the close protection encryption key"
+	icon_state = "bshield_cypherkey"
+	channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_MEDICAL = 1)