From 42fc6497d406e4a4f40d7f7a6ef7ef976bc30391 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 6 Aug 2017 03:13:11 -0500 Subject: [PATCH] Fixes hair sticking through hats. --- code/modules/clothing/clothing.dm | 1 + code/modules/clothing/head/collectable.dm | 9 +++++++++ code/modules/clothing/head/collectable.dm.rej | 9 +++++++++ code/modules/clothing/head/hardhat.dm | 1 + code/modules/clothing/head/helmet.dm | 1 + code/modules/clothing/head/jobs.dm | 4 ++++ code/modules/clothing/head/misc.dm | 6 +++++- code/modules/clothing/head/misc.dm.rej | 16 ++++++++++++++++ code/modules/clothing/head/misc_special.dm | 2 ++ icons/mob/hair_extensions.dmi | Bin 26997 -> 26993 bytes 10 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 code/modules/clothing/head/collectable.dm.rej create mode 100644 code/modules/clothing/head/misc.dm.rej diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 013fbd8bc4..9b75bb817f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -253,6 +253,7 @@ BLIND // can't see anything slot_flags = SLOT_HEAD var/blockTracking = 0 //For AI tracking var/can_toggle = null + dynamic_hair_suffix = "+generic" /obj/item/clothing/head/Initialize() . = ..() diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 8ec8d00c77..6c7acefe8f 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -4,6 +4,7 @@ /obj/item/clothing/head/collectable name = "collectable hat" desc = "A rare collectable hat." + dynamic_hair_suffix = "+detective" /obj/item/clothing/head/collectable/petehat name = "ultra rare Pete's hat!" @@ -14,6 +15,7 @@ name = "collectable slime cap!" desc = "It just latches right in place!" icon_state = "slime" + dynamic_hair_suffix = "" /obj/item/clothing/head/collectable/xenom name = "collectable xenomorph helmet!" @@ -25,6 +27,7 @@ desc = "A rare chef's hat meant for hat collectors!" icon_state = "chef" item_state = "chef" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/chef @@ -53,6 +56,7 @@ name = "collectable police officer's hat" desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW." icon_state = "policehelm" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/warden @@ -95,6 +99,7 @@ desc = "The fur feels... a bit too realistic." icon_state = "kitty" item_state = "kitty" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/kitty @@ -103,6 +108,7 @@ desc = "Not as lucky as the feet!" icon_state = "bunny" item_state = "bunny" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/rabbit @@ -125,6 +131,7 @@ name = "collectable HoS hat" desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!" icon_state = "hoscap" + dynamic_hair_suffix = "" /obj/item/clothing/head/collectable/HoP name = "collectable HoP hat" @@ -138,6 +145,7 @@ icon_state = "thunderdome" item_state = "thunderdome" resistance_flags = 0 + flags_inv = HIDEHAIR /obj/item/clothing/head/collectable/swat name = "collectable SWAT helmet" @@ -145,3 +153,4 @@ icon_state = "swat" item_state = "swat" resistance_flags = 0 + flags_inv = HIDEHAIR diff --git a/code/modules/clothing/head/collectable.dm.rej b/code/modules/clothing/head/collectable.dm.rej new file mode 100644 index 0000000000..82a9962cb8 --- /dev/null +++ b/code/modules/clothing/head/collectable.dm.rej @@ -0,0 +1,9 @@ +diff a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm (rejected hunks) +@@ -4,7 +4,6 @@ + /obj/item/clothing/head/collectable + name = "collectable hat" + desc = "A rare collectable hat." +- dynamic_hair_suffix = "+detective" + + + /obj/item/clothing/head/collectable/petehat diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 28fe8cacfb..6eefb458ed 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -10,6 +10,7 @@ flags_inv = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light) resistance_flags = FIRE_PROOF + dynamic_hair_suffix = "+generic" dog_fashion = /datum/dog_fashion/head diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index f100df4366..24d8049ac7 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -12,6 +12,7 @@ strip_delay = 60 resistance_flags = 0 flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR dog_fashion = /datum/dog_fashion/head/helmet diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 23b3da72ef..6a127f571b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -7,6 +7,7 @@ desc = "The commander in chef's head wear." strip_delay = 10 equip_delay_other = 10 + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/chef /obj/item/clothing/head/chefhat/suicide_act(mob/user) @@ -62,6 +63,7 @@ item_state = "cage" worn_x_dimension = 64 worn_y_dimension = 64 + dynamic_hair_suffix = "" /obj/item/clothing/head/witchunter_hat @@ -99,6 +101,7 @@ desc = "A beret, a mime's favorite headwear." icon_state = "beret" dog_fashion = /datum/dog_fashion/head/beret + dynamic_hair_suffix = "" /obj/item/clothing/head/beret/black name = "black beret" @@ -118,6 +121,7 @@ icon_state = "hoscap" armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0, fire = 50, acid = 60) strip_delay = 80 + dynamic_hair_suffix = "" /obj/item/clothing/head/HoS/syndicate name = "syndicate cap" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3eabbad438..ac82fc92db 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -56,6 +56,7 @@ name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/nurse @@ -110,6 +111,7 @@ name = "rabbit ears" desc = "Wearing these makes you look useless, and only good for your sex appeal." icon_state = "bunny" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/rabbit @@ -136,12 +138,14 @@ desc = "Yarr." icon_state = "bandana" item_state = "bandana" + dynamic_hair_suffix = "" /obj/item/clothing/head/bowler name = "bowler-hat" desc = "Gentleman, elite aboard!" icon_state = "bowler" item_state = "bowler" + dynamic_hair_suffix = "" /obj/item/clothing/head/witchwig name = "witch costume wig" @@ -183,7 +187,6 @@ item_state = "fedora" armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50) desc = "A really cool hat if you're a mobster. A really lame hat if you're not." - dynamic_hair_suffix = "+detective" pockets = /obj/item/weapon/storage/internal/pocket/small /obj/item/clothing/head/fedora/suicide_act(mob/user) @@ -277,6 +280,7 @@ icon_state = "crown" armor = list(melee = 15, bullet = 0, laser = 0,energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF + dynamic_hair_suffix = "" /obj/item/clothing/head/crown/fancy name = "magnificent crown" diff --git a/code/modules/clothing/head/misc.dm.rej b/code/modules/clothing/head/misc.dm.rej new file mode 100644 index 0000000000..df85f74b20 --- /dev/null +++ b/code/modules/clothing/head/misc.dm.rej @@ -0,0 +1,16 @@ +diff a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm (rejected hunks) +@@ -250,7 +250,7 @@ + name = "jester hat" + desc = "A hat with bells, to add some merriness to the suit." + icon_state = "jester_hat" +- dynamic_hair_suffix = "null" ++ dynamic_hair_suffix = "" + + /obj/item/clothing/head/rice_hat + name = "rice hat" +@@ -302,4 +302,4 @@ + name = "jester hat" + desc = "A hat with bells, to add some merriness to the suit." + icon_state = "jester_hat2" +- dynamic_hair_suffix = "null" ++ dynamic_hair_suffix = "" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 4c14fc0422..d15c7dd5f4 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -125,6 +125,7 @@ desc = "A pair of kitty ears. Meow!" icon_state = "kitty" color = "#999999" + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/kitty @@ -150,6 +151,7 @@ flags_inv = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) brightness_on = 1 //luminosity when on + dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/reindeer diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi index bd2adda94bd5bf652747baf6a360b8d63976bb47..5a4ee36157718e997c538c12d07849980ec37898 100644 GIT binary patch delta 653 zcmV;80&@NJ(gE?(0gxnrVtQ0qbVOxyV{&P5bZKvH004NLotUw18!-?>Yw0Tpy9^K{ zwo|GJYy>XsUkH}s9=SOlms#>o(ch=Au1S?)DS!_=4rh0kx_94Se!RZB=eO76#@0lO zJGrONUyg^1gr3~VJw6-{i6y4~@uPL>>`v}3k=RfFDRNyh9p_|y!IgoJXMl~*E%NP%zOpqkVum$2H}J^60}no zNdOgyoHK*_G_uHlRKOdWDbfOV3Ytv819|2o8)!MN{=8ZqfItzvUNQ`wb@95fft2wD z-YW1WS@@dBEAV(JM!P?D}->(W3ag5Rc#H_$$ntfNI#b*U6|1x5J1$~0lfS_3FS zB}09^f|Em&z?}pvxt#)g0+r6C5GaCar>I5HD5?@W2|5IS>_-DrHVx!NJq0+9nR8Vl5-*fi`YvXjJm-- zT4hF?MwR)0imG_CE$Y7;1{%YwM;&+*4}B0_xT24!Dt`p*V|&=4GJMST=u^HWwLXxO z3rFHBd(#VO!mK62L-BAbw4~OD$gCwc35*YXSxao)NMh=Hw?oJIn8wH^;eY-wxpyz` n&+hr{_4pTcrA1-|Eu^CW03ZNKL_t(|ob26UY#V8_qXN=q2tPDb delta 653 zcmV;80&@NF(gF3-0gxnrW_naubVOxyV{&P5bZKvH004NLrI;~q8!-%pXZu$O$ylIh zlXUb_Bq%Z@f1#i(p2VI`R4LuL{`Vc~TRQcrqlXW&o*wzgyLVq-zP-M?=eO76#@0lO zJGrNipN@x%gr3~VJw6-{i6y4~=SS<**`3^7BC+rOL*UNmE*sx}9S=dQxs!W39wwuO zn>)GBe*tF{2q@q=BqkW!vX+QKKe#k5C^fH*3PnM=s^!{A^1~?jWl+lvJ~3;FlSzpT z8)UWIP$W;yw*`MABU_tre@X>xxvERFj$yYW#%g^j6|ADQEY_qMuK+~ zBMGn;k#lDFtVR}pnF{=3Geuh9jzW_ud@;|QWP`2f)t^_(Ll`WF*GnG2&boNr*kI21 zGH_hrO|qV6l;Z_9{>0Q1ez7E7;YO!{N`(KRF5X~MRkDs3S=FUd&=r>B=PJ{LLTe4M z7?lk7{0dJZO#*ikxF~lH?j2M*mqM@{rk$b|!K187>?HVqNU>iLPU|$3F_BBpu>G}g zOSHW#h~1>dA_ zYxw-iA#zf9-PsQuetGyEyuur%UrS=b=e6A{Pa|F#Vem4LIA!Vsi5yIFP9$)ldx^tg zIox@x%y@HusWM-2MQ?`2eR%_6vv~EmGjBrT>)3@WzQk4eC2-f<;}RF-&o+U7VrWUN z4`uDbk@(8q^a7hRYl#En_kZL`OKN?P&01oUz$4>i))HGcl9>A58}aoarct&@__uF5 n_wMEW**(9#9)ANQOqhb69q$JK03ZNKL_t(|ob27Rn*!EmTyaCq