diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm
index d56c8421f2d..44a81c6a884 100644
--- a/code/datums/diseases/advance/symptoms/beard.dm
+++ b/code/datums/diseases/advance/symptoms/beard.dm
@@ -33,7 +33,7 @@ BONUS
switch(A.stage)
if(1, 2)
if(H.facial_hair_style == "Shaved")
- H.facial_hair_style = "Adam Jensen Beard"
+ H.facial_hair_style = "Jensen Beard"
H.update_hair()
if(3, 4)
if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard") && !(H.facial_hair_style == "Full Beard"))
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 4efa040e6c5..78d531101ab 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -970,7 +970,7 @@
/obj/item/clothing/under/suit_jacket/really_black=2,/obj/item/clothing/under/pants/jeans=3,/obj/item/clothing/under/pants/classicjeans=2,
/obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2,
/obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2,
- /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1,
+ /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/track=1,
/obj/item/clothing/tie/scarf/red=1,/obj/item/clothing/tie/scarf/green=1,/obj/item/clothing/tie/scarf/darkblue=1,
/obj/item/clothing/tie/scarf/purple=1,/obj/item/clothing/tie/scarf/yellow=1,/obj/item/clothing/tie/scarf/orange=1,
/obj/item/clothing/tie/scarf/lightblue=1,/obj/item/clothing/tie/scarf/white=1,/obj/item/clothing/tie/scarf/black=1,
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index e75d03cb4d8..53e796746ed 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -54,20 +54,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-/obj/item/clothing/suit/greatcoat
- name = "greatcoat"
- desc = "A Nazi greatcoat."
- icon_state = "nazi"
- item_state = "nazi"
-
-
-/obj/item/clothing/suit/johnny_coat
- name = "johnny~~ coat"
- desc = "Johnny~~"
- icon_state = "johnny"
- item_state = "johnny"
-
-
/obj/item/clothing/suit/justice
name = "justice suit"
desc = "this pretty much looks ridiculous" //Needs no fixing
@@ -214,7 +200,7 @@
name = "bomber jacket"
desc = "Aviators not included."
icon_state = "bomberjacket"
- item_state = "johnny"
+ item_state = "brownjsuit"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 58d5cb563e1..581cb073d03 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -13,7 +13,7 @@
name = "emergency firesuit"
desc = "A suit that helps protect against fire and heat."
icon_state = "fire"
- item_state = "fire_suit"
+ item_state = "ro_suit"
w_class = 4
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 28ad8e42ad1..2753980a5f1 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -3,9 +3,9 @@
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
- icon_state = "ba_suit"
- item_state = "ba_suit"
- item_color = "ba_suit"
+ icon_state = "bar_suit"
+ item_state = "bar_suit"
+ item_color = "bar_suit"
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -136,7 +136,7 @@
name = "black suit"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
icon_state = "blacksuit"
- item_state = "ba_suit"
+ item_state = "bar_suit"
item_color = "blacksuit"
can_adjust = 1
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 5947065bf55..3fd2cc664f7 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -117,48 +117,3 @@
icon_state = "scrubspurple"
item_color = "scrubspurple"
can_adjust = 0
-
-
-
-/*
- * Medsci, unused (i think) stuff
- */
-/obj/item/clothing/under/rank/geneticist_new
- desc = "It's made of a special fiber that provides minor protection against biohazards."
- name = "geneticist's jumpsuit"
- icon_state = "genetics_new"
- item_state = "w_suit"
- item_color = "genetics_new"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
- can_adjust = 0
-
-/obj/item/clothing/under/rank/chemist_new
- desc = "It's made of a special fiber that provides minor protection against biohazards."
- name = "chemist's jumpsuit"
- icon_state = "chemist_new"
- item_state = "w_suit"
- item_color = "chemist_new"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
- can_adjust = 0
-
-/obj/item/clothing/under/rank/scientist_new
- desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
- name = "scientist's jumpsuit"
- icon_state = "scientist_new"
- item_state = "w_suit"
- item_color = "scientist_new"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
- can_adjust = 0
-
-/obj/item/clothing/under/rank/virologist_new
- desc = "Made of a special fiber that gives increased protection against biohazards."
- name = "virologist's jumpsuit"
- icon_state = "virologist_new"
- item_state = "w_suit"
- item_color = "virologist_new"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
- can_adjust = 0
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 88cc52f77bd..97dde6868a0 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -134,13 +134,6 @@
fitted = 0
can_adjust = 0
-/obj/item/clothing/under/johnny
- name = "johnny~~ jumpsuit"
- desc = "Johnny~~"
- icon_state = "johnny"
- item_color = "johnny"
- can_adjust = 0
-
/obj/item/clothing/under/rainbow
name = "rainbow"
desc = "rainbow"
@@ -186,7 +179,6 @@
icon_state = "really_black_suit"
item_state = "bl_suit"
item_color = "black_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/female
name = "executive suit"
@@ -201,7 +193,6 @@
icon_state = "red_suit"
item_state = "r_suit"
item_color = "red_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/charcoal
name = "charcoal suit"
@@ -209,7 +200,6 @@
icon_state = "charcoal_suit"
item_state = "charcoal_suit"
item_color = "charcoal_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
@@ -217,7 +207,6 @@
icon_state = "navy_suit"
item_state = "navy_suit"
item_color = "navy_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/burgundy
name = "burgundy suit"
@@ -225,7 +214,6 @@
icon_state = "burgundy_suit"
item_state = "burgundy_suit"
item_color = "burgundy_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/checkered
name = "checkered suit"
@@ -233,7 +221,6 @@
icon_state = "checkered_suit"
item_state = "checkered_suit"
item_color = "checkered_suit"
- can_adjust = 0
/obj/item/clothing/under/suit_jacket/tan
name = "tan suit"
@@ -241,7 +228,13 @@
icon_state = "tan_suit"
item_state = "tan_suit"
item_color = "tan_suit"
- can_adjust = 0
+
+/obj/item/clothing/under/suit_jacket/white
+ name = "white suit"
+ desc = "A white suit and jacket with a black shirt. You wanna play rough? OKAY!."
+ icon_state = "white_suit"
+ item_state = "white_suit"
+ item_color = "white_suit"
/obj/item/clothing/under/blackskirt
name = "black skirt"
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index db060397c5a..15e4aa194a5 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -52,12 +52,6 @@
icon_state = "tanpants"
item_color = "tanpants"
-/obj/item/clothing/under/pants/blue
- name = "blue pants"
- desc = "Stylish blue pants. These go well with a lot of clothes."
- icon_state = "bluepants"
- item_color = "bluepants"
-
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index b90e2886ea3..53eaa53884f 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -184,19 +184,6 @@
else
message = "[src] hugs \himself."
- if ("johnny")
- var/M
- if (param)
- M = param
- if (!M)
- param = null
- else
- if(miming)
- message = "[src] takes a drag from a cigarette and blows \"[M]\" out in smoke."
- else
- message = "[src] says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows \his name out in smoke."
- m_type = 2
-
if ("me")
if(silent)
return
@@ -316,7 +303,7 @@
m_type = 2
if ("help") //This can stay at the bottom.
- src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, johnny, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
+ src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn"
else
..(act)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 02e8befd05e..7d26a965f30 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -85,7 +85,7 @@
else if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(BARTENDER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "bar_suit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY)
if(backbag == 2)
@@ -134,7 +134,7 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(CARGOTECH)
- clothes_s = new /icon('icons/mob/uniform.dmi', "cargo_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index fe87d9dc4ba..8b42ef1bcb8 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -274,7 +274,7 @@
icon_state = "hair_reversemohawk"
/datum/sprite_accessory/hair/jensen
- name = "Adam Jensen Hair"
+ name = "Jensen Hair"
icon_state = "hair_jensen"
/datum/sprite_accessory/hair/gelled
@@ -542,7 +542,7 @@
icon_state = "facial_gt"
/datum/sprite_accessory/facial_hair/jensen
- name = "Adam Jensen Beard"
+ name = "Jensen Beard"
icon_state = "facial_jensen"
/datum/sprite_accessory/facial_hair/dwarf
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index f47f1163eb4..d5929c607e4 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -48,7 +48,7 @@
name = "kinetic speargun"
desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
icon_state = "speargun"
- item_state = "misteratmos" //professional asset reuse
+ item_state = "speargun"
w_class = 4
force = 10
can_suppress = 0
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index b8f19bf080c..6fd59d0f965 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index d8b02e4e920..902ea60b68b 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index e83029f9fe5..f70ce1eafaf 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 43dcda058a5..acb1e00589c 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 21b71bf0c87..65a0027ff4d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 9cee4e8a3bb..fdc8ccdd1a8 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ