From 678e5267bdaeeea7fd0461d6264951efa8f55249 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 6 Jan 2023 11:57:37 -0300 Subject: [PATCH] Custom items 02/01/23 (#15495) --- code/modules/customitems/item_defines.dm | 43 +++++++++------------- icons/obj/custom_items/brianne_items.dmi | Bin 0 -> 1363 bytes icons/obj/custom_items/brianne_teapot.dmi | Bin 462 -> 0 bytes icons/obj/custom_items/caleb_badge.dmi | Bin 335 -> 0 bytes icons/obj/custom_items/qorja_headband.dmi | Bin 406 -> 0 bytes 5 files changed, 17 insertions(+), 26 deletions(-) create mode 100644 icons/obj/custom_items/brianne_items.dmi delete mode 100644 icons/obj/custom_items/brianne_teapot.dmi delete mode 100644 icons/obj/custom_items/caleb_badge.dmi delete mode 100644 icons/obj/custom_items/qorja_headband.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index d3768ef7e97..e6d8fa3a826 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -58,18 +58,6 @@ All custom items with worn sprites must follow the contained sprite system: http slot_flags = SLOT_MASK | SLOT_TIE -/obj/item/clothing/accessory/badge/fluff/caleb_badge //Worn Badge - Caleb Greene - notmegatron - name = "worn badge" - desc = "A simple gold badge denoting the wearer as Head of Security. It is worn and dulled with age, but the name, \"Caleb Greene\", is still clearly legible." - icon = 'icons/obj/custom_items/caleb_badge.dmi' - icon_override = 'icons/obj/custom_items/caleb_badge.dmi' - item_state = "caleb_badge" - icon_state = "caleb_badge" - stored_name = "Caleb Greene" - badge_string = "NOS Apollo Head of Security" - contained_sprite = TRUE - - /obj/item/clothing/under/fluff/ana_uniform //Retired Uniform - Ana Roh'hi'tin - suethecake name = "retired uniform" desc = "A silken blouse paired with dark-colored slacks. It has the words \"Chief Investigator\" embroidered into the shoulder bar." @@ -197,8 +185,8 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/reagent_containers/food/drinks/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana name = "ceramic teapot" desc = "A blue ceramic teapot, gilded with the abbreviation for NanoTrasen." - icon = 'icons/obj/custom_items/brianne_teapot.dmi' - icon_override = 'icons/obj/custom_items/brianne_teapot.dmi' + icon = 'icons/obj/custom_items/brianne_items.dmi' + icon_override = 'icons/obj/custom_items/brianne_items.dmi' icon_state = "brianne_teapot" @@ -328,17 +316,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "zilosnish_pen" -/obj/item/clothing/head/fluff/qorja_headband //Rebellious Headband - Q'orja Sak'ha - fortport - name = "rebellious headband" - desc = "A comfortable headband made from a long, soft cloth that's tied into a knot in the back. It is a bright shade of red, slipped through a decorative brass plate. \ - Upon the metal is an engraving of the People's Republic of Adhomai's insignia, as if straight from their flag." - icon = 'icons/obj/custom_items/qorja_headband.dmi' - icon_override = 'icons/obj/custom_items/qorja_headband.dmi' - icon_state = "qorja_headband" - item_state = "qorja_headband" - contained_sprite = TRUE - - /obj/item/clothing/wrists/watch/fluff/rex_watch //Engraved Wristwatch - Rex Winters - tailson name = "engraved wristwatch" desc = "A fine gold watch. On the inside is an engraving that reads \"Happy birthday dad, thinking of you always\"." @@ -2031,6 +2008,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/ielia_tarot.dmi' icon_state = "ielia_tarot" contained_sprite = TRUE + w_class = ITEMSIZE_SMALL var/list/possible_cards = list("Island","Hatching Egg","Star Chanter","Jiu'x'klua","Stormcloud","Gnarled Tree","Poet","Bloated Toad","Void","Qu'Poxii","Fisher","Mountain","Sraso","Nioh") var/activated = FALSE var/first_card @@ -2113,11 +2091,24 @@ All custom items with worn sprites must follow the contained sprite system: http activated = FALSE -/obj/item/clothing/suit/storage/fluff/osborne_suit //Osborne Strelitz - Osborne Strelitz - sirtoast +/obj/item/clothing/suit/storage/fluff/osborne_suit //Dominian Officers Trench Coat - Osborne Strelitz - sirtoast name = "dominian officer's trench coat" desc = "An Imperial Army trench coat that is used by Dominian officers in colder environments. This one is missing the unit insignia and has the symbol of a military count on its rank collar." icon = 'icons/obj/custom_items/osborne_suit.dmi' icon_override = 'icons/obj/custom_items/osborne_suit.dmi' icon_state = "osborne_suit" item_state = "osborne_suit" + contained_sprite = TRUE + + +/obj/item/storage/box/fancy/cigarettes/cigar/brianne_cigarettes //Martian Cigarette Case - Sean Brianne - Zelmana + name = "martian cigarette case" + desc = "A small, personal cigarette tin. It holds cigarettes similar to a cigarette packet but has some nice flair." + icon = 'icons/obj/custom_items/brianne_items.dmi' + icon_override = 'icons/obj/custom_items/brianne_items.dmi' + icon_state = "brianne_cigarettes" + item_state = "brianne_cigarettes" + icon_type = "cigarette" + can_hold = list(/obj/item/clothing/mask/smokable/cigarette/dromedaryco) + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco contained_sprite = TRUE \ No newline at end of file diff --git a/icons/obj/custom_items/brianne_items.dmi b/icons/obj/custom_items/brianne_items.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e8391fdf00eeb7457aa8631f1a2d6d692ee240da GIT binary patch literal 1363 zcmV-Z1+4msP){#&8oM$pHb1agV%St&(oI&&KuNo4a^z`p z>0W2pK1aBSB_%XHt}!~RNKwUKXx>|7*k*6$aCz}pVAa)$WUM$i=+_)YPQh<@?nO?* zJVmzr?8%dacR@s&e%y4q+P8dH}ucg*~_maDdJ-VgKw1-1om9q!2t000B7Nklc3`fHOwh1E_Vv-1>>da#>tmt+X1I+vk*0&U4yKAO=_` z%&jY~udkzb3}HycJpfVe#%rm4tA}~SCL{DEb;ZNar)+hQJT4ZR{mTI2E@n(Ug<1iG zvl<{T(j-aJIHfPCpLmpLw=W-~rFf1i+K*9jh-iI;o}Y8H^_ZAjKkfgQOz`xi6JwT_ z3Xy`gKQAZ9YxMV@`lo%39(CfN?e`6jFb9=~Wp=pG5qFs?BEt@08&00000003YB zq5J)@{eS3wzfb>fFbLc4`}hB5gP{GsSO0G#bieP@|GNSN?e{(Ue~$nG`+bl8-zUIx zbw?ciyehb@I&ta5r6=70j9UUU`gcu$rrr(E(mMg#dOJWz?*>SC&O8DH>i0eRf0E>u zQxLk}_vrs)!fiKp=zia$|93o?&iZ%a=;u|zZPkfOCoWxc6T3L|@7e(8x-LLN*92(l z-2g4U?_*Rs1n&1I=>G%v`{Von@clmee*gdg00000008{&a6^@CE$PSkPi0-3KaD@?L;wH)00000 z00000Ku`?t2GU+8hSmK{`uj_a?*<|o`^`^d8fh*1m<;omnBEN}lq9*=0AWB)0lZCy z`Abai21x2XIye4bTMv^#{tCmpftdJ@&h^KjpUDt^D}6p=Tsvg&d^P|80000000000 z0D#d0W2pK1aATJ+3i2t4LABUufQ2WY}hJ z=5TrOS76oX*BnJo!Ebo(MNYyzMYcgoykcwOKuNkSHl;mAxF|88IYP8IK(azhztr>L zkpKVy0d!JMQvg8b*k%9#0CIX%Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1Sjdnc12TKN-M&fm1L7DeG^U0Ie?ZM^r+0ds!4 zlPc^(-2{M{tUcI~H#>q2S~r?tcKK081u#SbLG`3ij=8jx50Enf&`Ubk7_a^|-2f3` zPURZab=m!MW&7ya#evS48ULmmSk}ouheY2mCRTpu1y*MWPg`)U{{R3007*qoM6N<$ Ef?e{&F#rGn diff --git a/icons/obj/custom_items/caleb_badge.dmi b/icons/obj/custom_items/caleb_badge.dmi deleted file mode 100644 index c50999052c6cd986ac851d59c21e1141c004e280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^2|(jJaWn(XeIgchCnG~WBtZ8Ye zZmMagX{c%&+SzTax_O0!M%Ia=GsC9Ln9Y@#94s9_t34pEX;Dn%!K>$4--t0Bd8XA+ zX2yuvgnxD;{^BSDP{Qq30Jd!9n!Tp#l)J#db@khgLxeDBM3d(PAw%>MHqQ_^*ybqt=aelF{r5}E*+w1g)B diff --git a/icons/obj/custom_items/qorja_headband.dmi b/icons/obj/custom_items/qorja_headband.dmi deleted file mode 100644 index e5ed076f5b62ed551bfb86a9701d1213e8790eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)R9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3KBSFuy1(F+L+TF(oN6FGY!qGbOXA7${-L#hF%=n41b=<4_J{Aat0Z=ulR0^>YEc z2mlWzEgs(N-$(!e0INwvK~zYI?Uca{!ypVrZCD_s3mB6D5||+SFIAdTTabgLMpYHR z1Cq`E82Ru4{)GT;lIl;86Gx%$IM!9Hk6D(p4Mf@rO$S-rTZ6mRT`P!n%bv#d^IZSq z#~0x?tY;Y?;3p*DtT8}HX