From 0a9a658ae653d62b07e790b5195709aa20592c5a Mon Sep 17 00:00:00 2001 From: Incoming Date: Fri, 23 Sep 2016 19:08:52 -0400 Subject: [PATCH 1/3] Day 0 fixes --- code/datums/outfit.dm | 1 + code/modules/clothing/clothing.dm | 1 + code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/surgery/bodyparts/helpers.dm | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 96b0a27e834..2705f5ca906 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -70,6 +70,7 @@ for(var/i=0,i Date: Fri, 23 Sep 2016 21:50:15 -0400 Subject: [PATCH 2/3] more fixes --- code/modules/clothing/clothing.dm | 21 +++++++++++++-------- icons/mob/uniform.dmi | Bin 236091 -> 236089 bytes 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index ba5066b0a1e..d347342d22c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -399,13 +399,16 @@ BLIND // can't see anything /obj/item/clothing/under/equipped(mob/user, slot) ..() + if(adjusted) + adjusted = NORMAL_STYLE + fitted = initial(fitted) + if(!alt_covers_chest) + body_parts_covered |= CHEST if(mutantrace_variation && ishuman(user)) var/mob/living/carbon/human/H = user if(DIGITIGRADE in H.dna.species.specflags) adjusted = DIGITIGRADE_STYLE - else if(adjusted == DIGITIGRADE_STYLE) - adjusted = NORMAL_STYLE H.update_inv_w_uniform() @@ -545,7 +548,10 @@ BLIND // can't see anything usr << "You adjust the suit to wear it more casually." else usr << "You adjust the suit back to normal." - usr.update_inv_w_uniform() + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + H.update_inv_w_uniform() + H.update_body() /obj/item/clothing/under/proc/toggle_jumpsuit_adjust() if(adjusted == DIGITIGRADE_STYLE) @@ -554,13 +560,12 @@ BLIND // can't see anything if(adjusted) if(fitted != FEMALE_UNIFORM_TOP) fitted = NO_FEMALE_UNIFORM - if (alt_covers_chest) // for the special snowflake suits that don't expose the chest when adjusted - body_parts_covered = CHEST|GROIN|LEGS - else - body_parts_covered = GROIN|LEGS + if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted + body_parts_covered &= ~CHEST else fitted = initial(fitted) - body_parts_covered = CHEST|GROIN|LEGS|ARMS + if(!alt_covers_chest) + body_parts_covered |= CHEST return adjusted /obj/item/clothing/under/examine(mob/user) diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 00235ef891f90cc0f749eacb646a96a4d3aca7c2..722a62a1ad4b04186d6773db5bcdc005ebcd0311 100644 GIT binary patch delta 705 zcmV;y0zUn_v<|tn4v-`PAh9KY0SViNAldb9OA!3Ct^pDOf8K)$1dS(aOFEH~g*wTc zB^QdN?UM#b!f`2I><5DG$=wL-o)|}J5?pk2?@Ph zYYPi|d6ojwTSA9)k!v@M(0>U=$dG>sFUYXJ2aDR|hw!(G51|L;#X{BTg+#2r1^84U za1)ggRN3PGe}^5L6L2#x;xZ)31+4bj1ZD)Kx0xVtD;ps1yOWtA(-N^=y_1Du9QK!5 zyP8fI{`+swc-e}Zy;qY_V8Bw@Ugi)=q`^pp%ZgeyXl!QX6+JLrD zgp@30f7|krqr{;dU^Neo&mihjCP<*%K3_Xq-;?%llY|YEGADm5GH^c3JLYF z^@jWx8VuYphe}5kD%1aKvm#+s<%@1sfs|Z6Pd+JhdDdSRNDm31%42I%2o$0APEE1q1Aq-v~#4 delta 707 zcmV;!0zCb>v<|zp4v-`PBC#ca0SUVeX?@L>Aj$Z%t^pDOe;z67$c%72SzFSHlq}Rq z<}A5TEN!1OKoX8i`C>m1bWiR^VE4p0Qj_okC(?0&i=kPEIa-)Ej?Kt5l^MbHo=ZsR z-CA2%*vqpNklqqHq>Eg;VTArmFhYj>LwG@k{XJOJCO?F~ReT6NC@&VOPA?>4^)0}s z3W1xbjG)REfA>G^*qnfyc@dW(NiJZu&n7SX?dDNGY5f|wen~-piZQ`Ap1VuxMjLqSye-U80VC|T(DFpafuuZsXPEash z<>+@&M3BBISJ3p+A?c_s_m;)YzmuQ=ms#wY&_*G2F1gi z3&jD&(dUj=rkIyB$DvPtgc?LAg(r&W0|1J4p3I2Cg(8eR&Fr1jW-?_I4>jM->z&@RY}vo=gAZH zE+~Bu{cM7JAzr5`K1XZW;g%1+&C4)@`hfM_mhfM_nw@n2D?39ShSr-5R From acf397ef7641bc41f639da9d1ebdf948b9a5aaef Mon Sep 17 00:00:00 2001 From: Incoming Date: Sat, 24 Sep 2016 00:01:06 -0400 Subject: [PATCH 3/3] yet more fixes --- code/datums/outfit.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 2705f5ca906..8478b2bb46a 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -70,7 +70,7 @@ for(var/i=0,i