From 8be72ec797b6db155079cbf45d5c9204f322716b Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sun, 30 Sep 2012 20:01:10 +0000 Subject: [PATCH] Added some stand-in sprites for medals. They remain admin-spawn only until there's proper sprites for them. The only one which isn't admin-spawn is the one the captain spawns with (it's on his jumpsuit) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4786 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/job/captain.dm | 4 +++- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/under/ties.dm | 3 ++- icons/mob/ties.dmi | Bin 553 -> 3215 bytes icons/obj/clothing/ties.dmi | Bin 862 -> 1269 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 538680dd7fa..5b9c5e56e03 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -16,7 +16,9 @@ if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform) + var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) + U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U) + H.equip_to_slot_or_del(U, slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 252adba8414..a4c5903135f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -204,7 +204,7 @@ BLIND // can't see anything ..() /obj/item/clothing/under/verb/removetie() - set name = "Remove Tie" + set name = "Remove Accessory" set category = "Object" set src in usr if(!istype(usr, /mob/living)) return diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index ea0eab9e88b..edefc013e2b 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -6,7 +6,7 @@ item_state = "" //no inhands color = "bluetie" flags = FPRINT | TABLEPASS - slot_flags = SLOT_ICLOTHING | SLOT_HEAD + slot_flags = 0 w_class = 2.0 /obj/item/clothing/tie/blue @@ -79,6 +79,7 @@ /obj/item/clothing/tie/medal/bronze_heart name = "bronze heart medal" desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." + icon_state = "bronze_heart" /obj/item/clothing/tie/medal/nobel_science name = "nobel sciences award" diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 0a476956e38f78b54fd4f3b42482a7a6ae06b095..c6625026b9a026ae7803a2376f2425538f13ecf5 100644 GIT binary patch literal 3215 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 L3H&otmn;7SQq9i@ literal 553 zcmV+^0@nSBP)004jl0{{R3eocQU0000UP)t-sz`(!~ zJX(MN0Ay?cf1CiWpa3-|7;$W7Nk&7Pl#G8E^YQ=y00DGTPE!Ct=GbNc005kNR9JLG zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3K9+DW^2GBr{csi!&v&s2HS;i!-e#F*g;&HpEb8givURU13pb z3NhwElo2*ABfqF9Gbx8CHzKJeY;bW&YDq?ZadLhEVS|y>;xt%U!PU`3@z50Iqi?V7-Jf3ZsNQHutQp@;s*sjXmMWmu|ffLi{=F zVR0!7ln4U2-kE^)62>Tul7j5xp0#yZmQwOiUinzmQqqCLq#I{GdNGAk6MQp&_B&yuvg^iGa4nnb^qK!oIt5 rg}y!b1-b?uUN;MWcvCvEPsGdv8E_Z7S9jJu00000NkvXXu0mjfSL)*o diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 2ea63b61e9c06e52cca577813c4029e0a3bc2b27..9d7b6aeaa719a01173071547b00aafe68382ba4e 100644 GIT binary patch literal 1269 zcmV{f1CiWpa33Mf`TO;q@w_mpa2|8fPgFOy1KfV0A`s0%*4dRjEs!1u&{M?bu26_NJvOmS64+vML$13 zXg4C5Q8H0cQHDn?Sy@@Yz`(%3z@ML=zrVlE&d!+t0RR6p0A`v0!vO!(0RR90+noUN zu>iQbLLLAB00DGTPE!Ct=GbNc005zSR9JLGWpiV4X>fFDZ*Bkpc$|&U&kDjY3bL#aII3Z2uVD_uE zRxk7ta@cLP3V>sfIV7u6fKG18`;)X+3(`Tk#RcebiK1+yo)rgdmMm7r_scBy<2oBxU3P1aUg+0Axwx1msdW z0kJbjWFSkj3>KOU^_sj!b6 zm9WnVE+_O(1TVC3xv zxb>-fv{?qY>alM8$fYX#(OUyf``yGt7&I5o$Ie>fU z2|`f@Qy*iDF~&G?6veRm7v7M73w0chP`o+)mxQ4J%jK|yWl@Vnc$<9pyymuyt=e#*dJG8>opDY(KfnL7VavF8Upy~HA2wX{XPBX zfWVS>)rwIy0FXoupI4)6O#l{ZQwjRAs%*F1(iC&_Jdg5+?f^Fsfek2t{$ibC7Xj)s zp)%*2Ur2y602LGg>znL*byZpQRTXs=kOcRDLthc<+M1p}gnNg+?o@}qLSTJ8LD)t5 zmJa=naIS;Xgli>_F~%5Uj4{Ti;^E<8(=;18*~cFrAGc3WTRQ!#0Pg@m;|D-reMW3H zP+lRn+hgRJ;M8Xm$LW`4>AqpN+Z`p}G>r?f+wJ%J{s@wPer5#J-|t`A7ee$0G#!Ap zWkOFtN%L2M2y9?~1fhIx%m)HmDghDt0veMdhl5sEp?8jy0cVlhw!i+T09=ONfWg;+ fH~2~(!xp~*K5k~@&uL&U00000NkvXXu0mjfR@q2A delta 860 zcmV-i1Ec))3El>OiBL{Q4GJ0x0000DNk~Le0000$0000$2m=5B0G+pi>;M1&Y*0*8 zMZmzo5K)w0DqhS zuAl&+9=-hgqYZfV#T6#KgpmjEu0buyu8jg%E#HQBhf0Sq2+%d;kCd z0d!JMQvg8b*k%9#0El{2Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1^SaP@Nm`wIZqpg@)a zd(*H000In2L_t(oh3%BxQiCuMg-Iy?A|#|0s}Wk?{~g^;QVUHs==8>Mx;MZu=i}_z z4N3BUi?R57&NuYwE=u589w)FOPT*ynz|x{fBLJS2Wfp%2R7DX5)MXg~fPt#0Dl$kg zP?vR02g!D6!5{|81kbaQLkyG&mms4YxCA-n022gh^VE5e)A+{m+>JOUR3G@lEWPx!1H~t{e z-ykE8o&%6a?@^EX+tqb<>U(h?p_4-1L+FGYXn;~b00_E=eX-q8 z5J&(_PDlye8^#*&s*Z0rgdm^?g0wDf0q;k3Z9-A{p+^(a(*r?&jEhI5r(g%5M}i+g zl4!kpoKHc3uw9rTcm(^+32O1U?m(C>Ob9+;HWtnrY6=5P0>Y#a&|Aq_&xo362QGvV z0CiM03AmZ{?d$Id01z}_2x!0n?2Qk=He@J5N6_wi`t)AnF|cg}&)~HS7=+foenFws mjxbHW{ofR{ahLv4q51+wLL`JIo3<_h0000