Beastmen claws, armor changes and fashion update (#1699)

-return claws to their old damage -added ballistic, ablative and mercenary helmets, placing them in the armoy and merc base -tweaked some things with some clothing items, like name and pockets -added scarfs as an accessory, available in the loadout -added pants, also available in the loadout -moved some things out of the armor.dmi to where they belong -move all hats and armor from the security jumpsuit dmi file to the their right places -moved the tunnel cloak to the xenowear section -fixed missing heavy vests at the merc base and the missing book scanner at the library
2026-01-03 22:12:38 +00:00 · 2017-02-11 13:34:41 -02:00
parent 11a01c0be6
commit d0997ee6a2
28 changed files with 366 additions and 184 deletions
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -67,3 +67,22 @@
 	path = /obj/item/clothing/accessory/storage/webbing
 	cost = 2

+/datum/gear/accessory/scarf
+	display_name = "scarf selection"
+	path = /obj/item/clothing/accessory/scarf
+
+/datum/gear/accessory/scarf/New()
+	..()
+	var/scarfs = list()
+	scarfs["white scarf"] = /obj/item/clothing/accessory/scarf
+	scarfs["yellow scarf"] = /obj/item/clothing/accessory/scarf/yellow
+	scarfs["green scarf"] = /obj/item/clothing/accessory/scarf/green
+	scarfs["purple scarf"] = /obj/item/clothing/accessory/scarf/purple
+	scarfs["black scarf"] = /obj/item/clothing/accessory/scarf/black
+	scarfs["red scarf"] = /obj/item/clothing/accessory/scarf/red
+	scarfs["orange scarf"] = /obj/item/clothing/accessory/scarf/orange
+	scarfs["light blue scarf"] = /obj/item/clothing/accessory/scarf/light_blue
+	scarfs["dark blue scarf"] = /obj/item/clothing/accessory/scarf/dark_blue
+	scarfs["zebra scarf"] = /obj/item/clothing/accessory/scarf/zebra
+	gear_tweaks += new/datum/gear_tweak/path(scarfs)
+	
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -47,11 +47,6 @@
 	path = /obj/item/weapon/material/kitchen/utensil/knife/boot
 	cost = 3

-/datum/gear/cape
-	display_name = "tunnel cloak"
-	path = /obj/item/weapon/storage/backpack/cloak
-	cost = 1
-
 /datum/gear/lunchbox
 	display_name = "lunchbox"
 	description = "A little lunchbox."
@@ -66,4 +61,4 @@
 		if(!initial(lunchbox.filled))
 			lunchboxes[initial(lunchbox.name)] = lunchbox_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes))
-	gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())
+	gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -75,7 +75,7 @@
 	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")

 /datum/gear/head/hardhat
-	display_name = "hardhat, yellow"
+	display_name = "hardhat selection"
 	path = /obj/item/clothing/head/hardhat
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")

--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -118,7 +118,7 @@
 /datum/gear/uniform/corpsecsuit
 	display_name = "uniform, corporate (Security)"
 	path = /obj/item/clothing/under/rank/security/corp
-	allowed_roles = list("Security Officer","Head of Security","Warden")
+	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet")

 /datum/gear/uniform/uniform_hop
 	display_name = "uniform, HoP's dress"
@@ -133,16 +133,32 @@
 /datum/gear/uniform/navysecsuit
 	display_name = "uniform, navyblue (Security)"
 	path = /obj/item/clothing/under/rank/security/navyblue
-	allowed_roles = list("Security Officer","Head of Security","Warden")
+	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet")

 /datum/gear/uniform/gearharness
 	display_name = "gear harness"
 	path = /obj/item/clothing/under/gearharness
 	cost = 2

-/datum/gear/uniform/track_pants
-	display_name = "track pants"
-	path = /obj/item/clothing/under/track
+/datum/gear/uniform/pants
+	display_name = "pants selection"
+	path = /obj/item/clothing/under/pants
+	
+/datum/gear/uniform/pants/New()
+	..()
+	var/pants = list()
+	pants["jeans"] = /obj/item/clothing/under/pants
+	pants["classic jeans"] = /obj/item/clothing/under/pants/classic
+	pants["must hang jeans"] = /obj/item/clothing/under/pants/musthang
+	pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
+	pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
+	pants["white pants"] = /obj/item/clothing/under/pants/white
+	pants["black pants"] = /obj/item/clothing/under/pants/black
+	pants["red pants"] = /obj/item/clothing/under/pants/red
+	pants["tan pants"] = /obj/item/clothing/under/pants/tan
+	pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
+	pants["track pants"] = /obj/item/clothing/under/pants/track
+	gear_tweaks += new/datum/gear_tweak/path(pants)
 	
 /datum/gear/uniform/turtleneck
 	display_name = "tacticool turtleneck"	
--- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm
@@ -67,6 +67,13 @@
 	cost = 1
 	whitelisted = "Vaurca"
 	sort_category = "Xenowear"
+	
+/datum/gear/cape
+	display_name = "tunnel cloak (Vaurca)"
+	path = /obj/item/weapon/storage/backpack/cloak
+	cost = 1
+	whitelisted = "Vaurca"
+	sort_category = "Xenowear"

 //beastmen gloves

@@ -104,5 +111,6 @@
 	taj_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/tajara
 	taj_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/tajara
 	taj_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/tajara
-	taj_gloves["white gloves"] = /obj/item/clothing/gloves/green/tajara
+	taj_gloves["green gloves"] = /obj/item/clothing/gloves/green/tajara
+	taj_gloves["white gloves"] = /obj/item/clothing/gloves/white/tajara
 	gear_tweaks += new/datum/gear_tweak/path(taj_gloves)
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -29,6 +29,19 @@
 	desc = "A security commissar's cap."
 	icon_state = "commissarcap"

+/obj/item/clothing/head/helmet/HoS
+	name = "head of security hat"
+	desc = "The hat of the Head of Security. For showing the officers who's in charge."
+	icon_state = "hoscap"
+	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	flags_inv = HIDEEARS
+	body_parts_covered = 0
+	
+/obj/item/clothing/head/helmet/HoS/dermal
+	name = "dermal armour patch"
+	desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
+	icon_state = "dermal"
+
 /obj/item/clothing/head/helmet/hop
 	name = "crew resource's hat"
 	desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority."
@@ -48,9 +61,27 @@
 	desc = "It's a helmet specifically designed to protect against close range attacks."
 	icon_state = "riot"
 	body_parts_covered = HEAD|FACE|EYES //face shield
-	armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
+	armor = list(melee = 80, bullet = 20, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
-	siemens_coefficient = 0.5
+
+/obj/item/clothing/head/helmet/ablative
+	name = "ablative helmet"
+	desc = "A helmet made from advanced materials which protects against concentrated energy weapons."
+	icon_state = "helmet_reflect"
+	armor = list(melee = 25, bullet = 25, laser = 80, energy = 10, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0
+
+/obj/item/clothing/head/helmet/ballistic
+	name = "ballistic helmet"
+	desc = "A helmet with reinforced plating to protect against ballistic projectiles."
+	icon_state = "helmet_bulletproof"
+	armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/head/helmet/merc
+	name = "combat helmet"
+	desc = "A tan helmet made from advanced ceramic."
+	icon_state = "helmet_tac"
+	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)

 /obj/item/clothing/head/helmet/swat
 	name = "\improper SWAT helmet"
@@ -61,7 +92,12 @@
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
-	siemens_coefficient = 0.5
+
+/obj/item/clothing/head/helmet/swat/peacekeeper
+	name = "\improper ERT civil protection helmet"
+	desc = "A full helmet made of highly advanced ceramic materials, complete with a jetblack visor. Shines with a mirror sheen."
+	icon_state = "erthelmet_peacekeeper"
+	item_state = "erthelmet_peacekeeper"

 /obj/item/clothing/head/helmet/thunderdome
 	name = "\improper Thunderdome helmet"
@@ -91,10 +127,9 @@

 	armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
 	flags_inv = HIDEEARS
-	siemens_coefficient = 0.5

 /obj/item/clothing/head/helmet/augment
-	name = "Augment Array"
+	name = "augment array"
 	desc = "A helmet with optical and cranial augments coupled to it."
 	icon_state = "v62"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
@@ -102,7 +137,6 @@
 	body_parts_covered = HEAD|EYES
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
-	siemens_coefficient = 0.5

 //Non-hardsuit ERT helmets.
 /obj/item/clothing/head/helmet/ert
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -120,3 +120,48 @@
 /obj/item/clothing/head/surgery/green
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
 	icon_state = "surgcap_green"
+
+//Detective
+
+
+/obj/item/clothing/head/det
+	name = "fedora"
+	desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
+	icon_state = "detective"
+	item_state_slots = list(
+		slot_l_hand_str = "det_hat",
+		slot_r_hand_str = "det_hat"
+		)
+	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
+	armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+	body_parts_covered = 0
+
+/obj/item/clothing/head/det/grey
+	icon_state = "detective2"
+	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
+
+/obj/item/clothing/head/det/technicolor
+	desc = "A 23rd-century fedora. It's fibres are hyper-absorbent."
+	icon = 'icons/obj/clothing/coloured_detective_coats.dmi'
+	icon_state = "hat_detective_black"
+	item_state = "hat_detective_black"
+	var/hat_color
+	contained_sprite = 1
+
+/obj/item/clothing/head/det/technicolor/New()
+	if(prob(5))
+		var/list/colors = list("yellow"=2,"red"=1,"white"=1,"orange"=1,"purple"=1,"green"=1,"blue"=1 )
+		var/color = pickweight(colors)
+		icon_state = "hat_detective_[color]"
+		item_state = "hat_detective_[color]"
+	..()
+
+/obj/item/clothing/head/det/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob)
+	if(istype(O, /obj/item/weapon/reagent_containers/glass/paint))
+		var/obj/item/weapon/reagent_containers/glass/paint/P = O
+		hat_color = P.paint_type
+		user.visible_message("<span class='warning'>[user] soaks \the [src] into [P]!</span>")
+		icon_state = "hat_detective_[hat_color]"
+		item_state = "hat_detective_[hat_color]"
+	..()
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -3,7 +3,7 @@
 //      Meaning the the suit is defined directly after the corrisponding helmet. Just like below!

 /obj/item/clothing/head/helmet/space
-	name = "Space helmet"
+	name = "space helmet"
 	icon_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
@@ -58,7 +58,7 @@
 		user << "This helmet has a built-in camera. It's [camera && camera.status ? "" : "in"]active."

 /obj/item/clothing/suit/space
-	name = "Space suit"
+	name = "space suit"
 	desc = "A suit that protects against low pressure environments. \"NSS EXODUS\" is written in large block letters on the back."
 	icon_state = "space"
 	item_state = "s_suit"
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -73,21 +73,36 @@
 	item_state = "armor"

 /obj/item/clothing/suit/armor/vest/warden
-	name = "Warden's jacket"
+	name = "warden's jacket"
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "warden_jacket"
-	item_state = "armor"
+	item_state = "warden_jacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	pocket_slots = 4//Jackets have more slots

 /obj/item/clothing/suit/armor/vest/warden/commissar
-	name = "Commissar's jacket"
+	name = "commissar's jacket"
 	desc = "An tasteful dark blue jacket with silver and white highlights. Has hard-plate inserts for armor."
 	icon_state = "commissar_warden"
 	item_state = "commissar_warden"

+/obj/item/clothing/suit/armor/hos
+	name = "head of security's jacket"
+	desc = "An armoured jacket with golden rank pips and livery."
+	icon_state = "hos"
+	item_state = "hos"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	pocket_slots = 4//More slots because coat
+	
+/obj/item/clothing/suit/armor/hos/jensen
+	name = "armored trenchcoat"
+	desc = "A trenchcoat augmented with a special alloy for some protection and style."
+	icon_state = "jensencoat"
+	item_state = "jensencoat"
+
 /obj/item/clothing/suit/armor/riot
-	name = "Riot Suit"
+	name = "riot suit"
 	desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
 	icon_state = "riot"
 	item_state = "swat_suit"
@@ -97,33 +112,24 @@
 	siemens_coefficient = 0.5
 	pocket_slots = 4//Fullbody suit, so more slots

-
 /obj/item/clothing/suit/armor/bulletproof
-	name = "Bulletproof Vest"
+	name = "bulletproof vest"
 	desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles."
 	icon_state = "bulletproof"
 	item_state = "armor"
 	blood_overlay_type = "armor"
 	armor = list(melee = 25, bullet = 80, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.6
-
-/obj/item/clothing/head/helmet/swat/peacekeeper
-	name = "\improper ERT civil protection helmet"
-	desc = "A full helmet made of highly advanced ceramic materials, complete with a jetblack visor. Shines with a mirror sheen."
-	icon_state = "erthelmet_peacekeeper"
-	body_parts_covered = HEAD
-	item_state = "erthelmet_peacekeeper"
-	armor = list(melee = 80, bullet = 60, laser = 50,energy = 50, bomb = 50, bio = 10, rad = 0)
-	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
+	pocket_slots = 4

 /obj/item/clothing/suit/armor/laserproof
-	name = "Ablative Armor Vest"
+	name = "ablative armor vest"
 	desc = "A vest that excels in protecting the wearer against energy projectiles."
 	icon_state = "armor_reflec"
 	item_state = "armor_reflec"
 	blood_overlay_type = "armor"
 	armor = list(melee = 25, bullet = 25, laser = 80, energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0
+	pocket_slots = 4

 /obj/item/clothing/suit/armor/laserproof/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if(istype(damage_source, /obj/item/projectile/energy) || istype(damage_source, /obj/item/projectile/beam))
@@ -163,7 +169,6 @@
 	siemens_coefficient = 0.5
 	pocket_slots = 4//fullbody, more slots

-
 /obj/item/clothing/suit/armor/swat/officer
 	name = "officer jacket"
 	desc = "An armored jacket used in special operations."
@@ -174,7 +179,6 @@
 	body_parts_covered = UPPER_TORSO|ARMS
 	pocket_slots = 4//coat, so more slots

-
 /obj/item/clothing/suit/armor/det_suit
 	name = "armor"
 	desc = "An armored vest with a detective's badge on it."
@@ -188,7 +192,7 @@
 //Reactive armor
 //When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!)
 /obj/item/clothing/suit/armor/reactive
-	name = "Reactive Teleport Armor"
+	name = "reactive teleport armor"
 	desc = "Someone separated our Research Director from their own head!"
 	var/active = 0.0
 	icon_state = "reactiveoff"
@@ -335,7 +339,7 @@

 /obj/item/clothing/suit/storage/vest/New()
 	..()
-	pockets.storage_slots = 4	//two slots
+	pockets.storage_slots = 2	//two slots

 /obj/item/clothing/suit/storage/vest/officer
 	name = "officer armor vest"
@@ -427,19 +431,8 @@
 	item_state = "mercwebvest"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)

-/obj/item/clothing/under/ccpolice
-	name = "ERT civil protection uniform"
-	desc = "A sturdy navy uniform, carefully ironed and folded. Worn by specialist troopers on civil protection duties."
-	icon_state = "officerdnavyclothes"
-	item_state = "scratch"
-	worn_state = "officerdnavyclothes"
+//ert related armor

-/obj/item/clothing/under/rank/centcom_commander
-	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Commander.\ It has a patch denoting a Pheonix on the sleeves."
-	name = "\improper ERT Commander's Dress Uniform"
-	icon_state = "centcom"
-	item_state = "lawyer_black"
-	worn_state = "centcom"
 /obj/item/clothing/suit/storage/vest/heavy/ert
 	name = "ERT trooper's plate carrier"
 	desc = "A plate carrier worn by troopers of the emergency response team. Has crimson highlights."
@@ -456,7 +449,7 @@
 	item_state = "ert_commander"

 /obj/item/clothing/suit/storage/vest/heavy/ert/lead
-	name = "Leading trooper's plate carrier"
+	name = "leading trooper's plate carrier"
 	desc = "A plate carrier worn by veteran troopers of the emergency response team qualified to lead small squads. Has blue highlights."
 	icon_state = "ert_lead"
 	item_state = "ert_lead"
@@ -479,10 +472,11 @@
 	icon_state = "ert_peacekeeper"
 	item_state = "ert_peacekeeper"

+//warden armor
+

 //All of the armor below is mostly unused

-
 /obj/item/clothing/suit/armor/centcomm
 	name = "Cent. Com. armor"
 	desc = "A suit that protects against some damage."
@@ -514,14 +508,14 @@
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

 /obj/item/clothing/suit/armor/tdome/red
-	name = "Thunderdome suit (red)"
+	name = "thunderdome suit (red)"
 	desc = "Reddish armor."
 	icon_state = "tdred"
 	item_state = "tdred"
 	siemens_coefficient = 1

 /obj/item/clothing/suit/armor/tdome/green
-	name = "Thunderdome suit (green)"
+	name = "thunderdome suit (green)"
 	desc = "Pukish armor."
 	icon_state = "tdgreen"
 	item_state = "tdgreen"
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -90,7 +90,7 @@

 //Plague Dr mask can be found in clothing/masks/gasmask.dm
 /obj/item/clothing/suit/bio_suit/plaguedoctorsuit
-	name = "Plague doctor suit"
+	name = "plague doctor suit"
 	desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
 	icon_state = "plaguedoctor"
 	item_state = "bio_suit"
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -63,7 +63,7 @@

 //Chef
 /obj/item/clothing/suit/chef/classic
-	name = "A classic chef's apron."
+	name = "classic chef's apron"
 	desc = "A basic, dull, white chef's apron."
 	icon_state = "apronchef"
 	item_state = "apronchef"
@@ -166,7 +166,7 @@

 //Lawyer
 /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
-	name = "Blue Suit Jacket"
+	name = "blue suit Jacket"
 	desc = "A snappy dress jacket."
 	icon_state = "suitjacket_blue_open"
 	item_state = "suitjacket_blue_open"
@@ -176,7 +176,7 @@
 	body_parts_covered = UPPER_TORSO|ARMS

 /obj/item/clothing/suit/storage/lawyer/purpjacket
-	name = "Purple Suit Jacket"
+	name = "blue suit Jacket"
 	desc = "A snappy dress jacket."
 	icon_state = "suitjacket_purp"
 	item_state = "suitjacket_purp"
@@ -185,7 +185,7 @@

 //Internal Affairs
 /obj/item/clothing/suit/storage/toggle/internalaffairs
-	name = "Internal Affairs Jacket"
+	name = "internal affairs jacket"
 	desc = "A smooth black jacket."
 	icon_state = "ia_jacket_open"
 	item_state = "ia_jacket"
@@ -194,8 +194,6 @@
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|ARMS

-
-
 //Medical
 /obj/item/clothing/suit/storage/toggle/fr_jacket
 	name = "first responder jacket"
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -66,7 +66,7 @@
 	icon_closed = "labcoat_cmoalt"

 /obj/item/clothing/suit/storage/toggle/labcoat/mad
-	name = "The Mad's labcoat"
+	name = "the mad's labcoat"
 	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
 	icon_state = "labgreen_open"
 	item_state = "labgreen"
@@ -74,21 +74,21 @@
 	icon_closed = "labgreen"

 /obj/item/clothing/suit/storage/toggle/labcoat/genetics
-	name = "Geneticist labcoat"
+	name = "geneticist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
 	icon_state = "labcoat_gen_open"
 	icon_open = "labcoat_gen_open"
 	icon_closed = "labcoat_gen"

 /obj/item/clothing/suit/storage/toggle/labcoat/chemist
-	name = "Chemist labcoat"
+	name = "chemist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"
 	icon_open = "labcoat_chem_open"
 	icon_closed = "labcoat_chem"

 /obj/item/clothing/suit/storage/toggle/labcoat/virologist
-	name = "Virologist labcoat"
+	name = "virologist labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
 	icon_open = "labcoat_vir_open"
@@ -96,7 +96,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)

 /obj/item/clothing/suit/storage/toggle/labcoat/science
-	name = "Scientist labcoat"
+	name = "scientist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"
 	icon_open = "labcoat_tox_open"
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -119,7 +119,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET

 /obj/item/clothing/suit/hastur
-	name = "Hastur's Robes"
+	name = "hastur's robes"
 	desc = "Robes not meant to be worn by man"
 	icon_state = "hastur"
 	item_state = "hastur"
@@ -128,7 +128,7 @@


 /obj/item/clothing/suit/imperium_monk
-	name = "Imperium monk"
+	name = "imperium monk"
 	desc = "Have YOU killed a xenos today?"
 	icon_state = "imperium_monk"
 	item_state = "imperium_monk"
@@ -137,7 +137,7 @@


 /obj/item/clothing/suit/chickensuit
-	name = "Chicken Suit"
+	name = "chicken suit"
 	desc = "A suit made long ago by the ancient empire KFC."
 	icon_state = "chickensuit"
 	item_state = "chickensuit"
@@ -147,7 +147,7 @@


 /obj/item/clothing/suit/monkeysuit
-	name = "Monkey Suit"
+	name = "monkey suit"
 	desc = "A suit that looks like a primate"
 	icon_state = "monkeysuit"
 	item_state = "monkeysuit"
@@ -157,7 +157,7 @@


 /obj/item/clothing/suit/holidaypriest
-	name = "Holiday Priest"
+	name = "holiday priest"
 	desc = "This is a nice holiday my son."
 	icon_state = "holidaypriest"
 	item_state = "holidaypriest"
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -167,7 +167,7 @@
 * Radiation protection
 */
 /obj/item/clothing/head/radiation
-	name = "Radiation Hood"
+	name = "radiation Hood"
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
 	flags_inv = BLOCKHAIR
@@ -176,7 +176,7 @@


 /obj/item/clothing/suit/radiation
-	name = "Radiation suit"
+	name = "radiation suit"
 	desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
 	icon_state = "rad"
 	item_state = "rad_suit"
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -155,17 +155,6 @@
 	icon_state = "bronze"
 	item_state = "bronze"
 	
-/obj/item/clothing/accessory/medal/iron
-	name = "iron medal"
-	desc = "A simple iron medal."
-	icon_state = "iron"
-	item_state = "iron"
-
-/obj/item/clothing/accessory/medal/iron/merit
-	name = "iron merit medal"
-	desc = "An iron medal awarded to NanoTrasen employees for merit."
-	icon_state = "iron_nt"
-
 /obj/item/clothing/accessory/medal/conduct
 	name = "distinguished conduct medal"
 	desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew."
@@ -180,6 +169,17 @@
 	name = "nobel sciences award"
 	desc = "A bronze medal which represents significant contributions to the field of science or engineering."

+/obj/item/clothing/accessory/medal/iron
+	name = "iron medal"
+	desc = "A simple iron medal."
+	icon_state = "iron"
+	item_state = "iron"
+
+/obj/item/clothing/accessory/medal/iron/merit
+	name = "iron merit medal"
+	desc = "An iron medal awarded to NanoTrasen employees for merit."
+	icon_state = "iron_nt"
+
 /obj/item/clothing/accessory/medal/silver
 	name = "silver medal"
 	desc = "A silver medal."
@@ -224,3 +224,54 @@
 	desc = "They suspend the illusion of the mime's play."
 	icon_state = "suspenders"
 	item_state = "suspenders"
+
+/obj/item/clothing/accessory/scarf
+	name = "white scarf"
+	desc = "A simple scarf, to protect your neck from the cold of space."
+	icon_state = "whitescarf"
+	item_state = "whitescarf"
+	
+/obj/item/clothing/accessory/scarf/yellow
+	name = "yellow scarf"
+	icon_state = "yellowscarf"
+	item_state = "yellowscarf"
+	
+/obj/item/clothing/accessory/scarf/green
+	name = "green scarf"
+	icon_state = "greenscarf"
+	item_state = "greenscarf"
+	
+/obj/item/clothing/accessory/scarf/purple
+	name = "purple scarf"
+	icon_state = "purplescarf"
+	item_state = "purplescarf"
+	
+/obj/item/clothing/accessory/scarf/black
+	name = "black scarf"
+	icon_state = "blackscarf"
+	item_state = "blackscarf"
+	
+/obj/item/clothing/accessory/scarf/red
+	name = "red scarf"
+	icon_state = "redscarf"
+	item_state = "redscarf"
+	
+/obj/item/clothing/accessory/scarf/orange
+	name = "orange scarf"
+	icon_state = "orangescarf"
+	item_state = "orangescarf"
+	
+/obj/item/clothing/accessory/scarf/light_blue
+	name = "light blue scarf"
+	icon_state = "lightbluescarf"
+	item_state = "lightbluescarf"
+	
+/obj/item/clothing/accessory/scarf/dark_blue
+	name = "dark blue scarf"
+	icon_state = "darkbluescarf"
+	item_state = "darkbluescarf"
+	
+/obj/item/clothing/accessory/scarf/zebra
+	name = "zebra scarf"
+	icon_state = "zebrascarf"
+	item_state = "zebrascarf"
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -92,48 +92,6 @@
 	icon_state = "polsuit"
 	worn_state = "polsuit"

-/obj/item/clothing/head/det
-	name = "fedora"
-	desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
-	icon_state = "detective"
-	item_state_slots = list(
-		slot_l_hand_str = "det_hat",
-		slot_r_hand_str = "det_hat"
-		)
-	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
-	armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.7
-	body_parts_covered = 0
-
-/obj/item/clothing/head/det/grey
-	icon_state = "detective2"
-	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
-
-/obj/item/clothing/head/det/technicolor
-	desc = "A 23rd-century fedora. It's fibres are hyper-absorbent."
-	icon = 'icons/obj/clothing/coloured_detective_coats.dmi'
-	icon_state = "hat_detective_black"
-	item_state = "hat_detective_black"
-	var/hat_color
-	contained_sprite = 1
-
-/obj/item/clothing/head/det/technicolor/New()
-	if(prob(5))
-		var/list/colors = list("yellow"=2,"red"=1,"white"=1,"orange"=1,"purple"=1,"green"=1,"blue"=1 )
-		var/color = pickweight(colors)
-		icon_state = "hat_detective_[color]"
-		item_state = "hat_detective_[color]"
-	..()
-
-/obj/item/clothing/head/det/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob)
-	if(istype(O, /obj/item/weapon/reagent_containers/glass/paint))
-		var/obj/item/weapon/reagent_containers/glass/paint/P = O
-		hat_color = P.paint_type
-		user.visible_message("<span class='warning'>[user] soaks \the [src] into [P]!</span>")
-		icon_state = "hat_detective_[hat_color]"
-		item_state = "hat_detective_[hat_color]"
-	..()
-
 /*
 * Head of Security
 */
@@ -151,30 +109,6 @@
 	//item_state = "hos_corporate"
 	worn_state = "hos_corporate"

-/obj/item/clothing/head/helmet/HoS
-	name = "Head of Security hat"
-	desc = "The hat of the Head of Security. For showing the officers who's in charge."
-	icon_state = "hoscap"
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-	flags_inv = HIDEEARS
-	body_parts_covered = 0
-	siemens_coefficient = 0.5
-
-/obj/item/clothing/head/helmet/HoS/dermal
-	name = "Dermal Armour Patch"
-	desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
-	icon_state = "dermal"
-
-/obj/item/clothing/suit/armor/hos
-	name = "head of security's jacket"
-	desc = "An armoured jacket with golden rank pips and livery."
-	icon_state = "hos"
-	item_state = "hos"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
-	siemens_coefficient = 0.5
-	pocket_slots = 4//More slots because coat
-
 //Jensen cosplay gear
 /obj/item/clothing/under/rank/head_of_security/jensen
 	desc = "You never asked for anything that stylish."
@@ -183,12 +117,6 @@
 	item_state = "jensen"
 	worn_state = "jensen"

-/obj/item/clothing/suit/armor/hos/jensen
-	name = "armored trenchcoat"
-	desc = "A trenchcoat augmented with a special alloy for some protection and style."
-	icon_state = "jensencoat"
-	item_state = "jensencoat"
-
 /*
 * Navy uniforms
 */
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -106,6 +106,20 @@
 	worn_state = "ert_uniform"
 	siemens_coefficient = 0.7

+/obj/item/clothing/under/ccpolice
+	name = "ERT civil protection uniform"
+	desc = "A sturdy navy uniform, carefully ironed and folded. Worn by specialist troopers on civil protection duties."
+	icon_state = "officerdnavyclothes"
+	item_state = "scratch"
+	worn_state = "officerdnavyclothes"
+
+/obj/item/clothing/under/rank/centcom_commander
+	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Commander.\ It has a patch denoting a Pheonix on the sleeves."
+	name = "\improper ERT commander's dress uniform"
+	icon_state = "centcom"
+	item_state = "lawyer_black"
+	worn_state = "centcom"
+
 /obj/item/clothing/under/space
 	name = "\improper NASA jumpsuit"
 	desc = "It has a NASA logo on it and is made of space-proofed materials."
@@ -529,11 +543,3 @@
 	icon_state = "blue_blazer"
 	item_state = "blue_blazer"
 	worn_state = "blue_blazer"
-
-/obj/item/clothing/under/track
-	name = "track pants"
-	desc = "Track pants, perfect for squatting."
-	icon = 'icons/obj/tracksuit.dmi'
-	icon_state = "trackpants"
-	item_state = "trackpants"
-	contained_sprite = 1
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -28,3 +28,83 @@
 	name = "grey athletic shorts"
 	icon_state = "greyshorts"
 	worn_state = "greyshorts"
+
+//pants
+
+/obj/item/clothing/under/pants
+	name = "jeans"
+	desc = "A nondescript pair of tough blue jeans."
+	icon = 'icons/obj/pants.dmi'
+	icon_state = "jeans"
+	item_state = "jeans"
+	contained_sprite = 1
+	gender = PLURAL
+	body_parts_covered = LOWER_TORSO
+
+/obj/item/clothing/under/pants/track
+	name = "track pants"
+	desc = "Track pants, perfect for squatting."
+	icon = 'icons/obj/tracksuit.dmi'
+	icon_state = "trackpants"
+	item_state = "trackpants"
+	contained_sprite = 1
+	
+/obj/item/clothing/under/pants/classic
+	name = "classic jeans"
+	desc = "A  pair of classic jeans."
+	icon_state = "jeansclassic"
+	item_state = "jeansclassic"
+
+/obj/item/clothing/under/pants/musthang
+	name = "must hang jeans"
+	desc = "Made in the finest space jeans factory this side of Tau Ceti."
+	icon_state = "jeansmustang"
+	item_state = "jeansmustang"
+	
+/obj/item/clothing/under/pants/jeansblack
+	name = "black jeans"
+	desc = "A  pair of black jeans."
+	icon_state = "jeansblack"
+	item_state = "jeansblack"
+	
+/obj/item/clothing/under/pants/youngfolksjeans
+	name = "young folks jeans"
+	desc = "For those tired of boring old jeans."
+	icon_state = "jeansyoungfolks"
+	item_state = "jeansyoungfolks"
+	
+/obj/item/clothing/under/pants/white
+	name = "white pants"
+	desc = "Plain boring white pants."
+	icon_state = "whitepants"
+	item_state = "whitepants"
+	
+/obj/item/clothing/under/pants/black
+	name = "black pants"
+	desc = "A pair of plain black pants."
+	icon_state = "blackpants"
+	item_state = "blackpants"
+	
+/obj/item/clothing/under/pants/red
+	name = "red pants"
+	desc = "Bright red pants."
+	icon_state = "redpants"
+	item_state = "redpants"
+	
+/obj/item/clothing/under/pants/tan
+	name = "tan pants"
+	desc = "Some tan pants. You look like a white collar worker with these on."
+	icon_state = "tanpants"
+	item_state = "tanpants"
+	
+/obj/item/clothing/under/pants/khaki
+	name = "tan pants"
+	desc = "A pair of dust beige khaki pants."
+	icon_state = "khaki"
+	item_state = "khaki"
+	
+/obj/item/clothing/under/pants/camo
+	name = "camouflage pants"
+	desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
+	icon_state = "camopants"
+	item_state = "camopants"
--- a/code/modules/mob/living/carbon/human/species/species_attack.dm
+++ b/code/modules/mob/living/carbon/human/species/species_attack.dm
@@ -4,6 +4,7 @@
 	shredding = 0
 	sharp = 1
 	edge = 1
+	damage = 5

 /datum/unarmed_attack/diona
 	attack_verb = list("lashed", "bludgeoned")
@@ -20,6 +21,7 @@
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	sharp = 1
 	edge = 1
+	damage = 5

 /datum/unarmed_attack/claws/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
 	var/skill = user.skills["combat"]
@@ -54,12 +56,12 @@

 /datum/unarmed_attack/claws/strong
 	attack_verb = list("slashed")
-	damage = 5
+	damage = 10
 	shredding = 1

 /datum/unarmed_attack/bite/strong
 	attack_verb = list("mauled")
-	damage = 8
+	damage = 10
 	shredding = 1

 /datum/unarmed_attack/slime_glomp
@@ -105,4 +107,4 @@
 		sleep(1)
 		step_away(target,user,15)
 		sleep(1)
-		target.apply_effect(attack_damage * 0.4, WEAKEN, armour)
+		target.apply_effect(attack_damage * 0.4, WEAKEN, armour)