From a9b1417f3ee1d48a84578c575b46c9c6069ac49f Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Sat, 10 Jun 2023 21:57:13 +0100 Subject: [PATCH 01/14] version1 --- code/game/objects/items/storage/fancy.dm | 14 ++++++++++++++ code/game/objects/items/toys/trading_cards.dm | 14 ++++++++++++++ colonialmarines.dme | 1 + icons/obj/items/cigarettes.dmi | Bin 21037 -> 23560 bytes icons/obj/items/playing_cards.dmi | Bin 5056 -> 6465 bytes 5 files changed, 29 insertions(+) create mode 100644 code/game/objects/items/toys/trading_cards.dm diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2e54d725511d..138161750b9f 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -223,6 +223,20 @@ default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette storage_slots = 4 +/obj/item/storage/fancy/cigarettes/trading_card + name = "\improper Weyland-Yutani Trading Card Gold packet" + desc = "Gotta collect them all, and smoke them all! This fancy trading card collector version of Weyland Yutani Gold has one card that is apart of the 3 available 5-card sets." + icon_state = "collectpacket" + item_state = "collectpacket" + var/has_card = 1 + +/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/W, mob/user) + if(!(W == attack_hand(user))) + return + + if(has_card) + new /obj/item/toy/trading_card + ///////////// //CIGAR BOX// ///////////// diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm new file mode 100644 index 000000000000..cf553f6ad189 --- /dev/null +++ b/code/game/objects/items/toys/trading_cards.dm @@ -0,0 +1,14 @@ +/obj/item/toy/trading_card + icon = 'icons/obj/items/playing_cards.dmi' + var/trading_card_number = "1" + var/picture_description = "Barrel Charger" + var/collection_colour = "Red" + + name = " [collection_colour] WeyYu Trading Card #[trading_card_number]" + + desc = "The back of a [collection_colour] trading card with the text: WeyYu Trading Cards! GOTTA COLLECT EM ALL!" + flipped_description = "A [collection_colour] trading card with a picture of a [picture_description] emblazoned on it. It is number [trading_card_number] out of the five [collection_colour] cards." + + icon_state = "trading_[collection_colour]" + flipped_icon_state = "trading_[collection_colour]_[trading_card_number]" + diff --git a/colonialmarines.dme b/colonialmarines.dme index fb138da60d54..160df29ebf9c 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1136,6 +1136,7 @@ #include "code\game\objects\items\toys\crayons.dm" #include "code\game\objects\items\toys\toy_weapons.dm" #include "code\game\objects\items\toys\toys.dm" +#include "code\game\objects\items\toys\trading_cards.dm" #include "code\game\objects\items\weapons\blades.dm" #include "code\game\objects\items\weapons\energy.dm" #include "code\game\objects\items\weapons\misc.dm" diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi index db313199afb2fdfd326b1f7fc46ebd7df79a6bd5..4ff939e875667b6a3bf5df5d3e0da5d63ec29c0e 100644 GIT binary patch literal 23560 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 L*une*KVJVQ7??8F literal 21037 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 diff --git a/icons/obj/items/playing_cards.dmi b/icons/obj/items/playing_cards.dmi index 4db5c94cf063b9df6b34ca953bf70df8ddba28e7..b5c8d9d6c251ae9ae15074a1d3dd600db05e0d4d 100644 GIT binary patch literal 6465 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 Date: Mon, 5 Feb 2024 02:38:18 +0000 Subject: [PATCH 02/14] Trading_Cards_Wo_Finished_Sprites --- code/game/machinery/vending/vending_types.dm | 17 ++- code/game/objects/items/storage/fancy.dm | 107 ++++++++++++++++-- code/game/objects/items/toys/trading_cards.dm | 59 ++++++++-- icons/obj/items/cigarettes.dmi | Bin 23560 -> 23775 bytes icons/obj/items/playing_cards.dmi | Bin 6465 -> 7029 bytes 5 files changed, 167 insertions(+), 16 deletions(-) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 0a7b85cae7e2..92ba81af4d94 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -200,25 +200,30 @@ /obj/item/storage/fancy/cigarettes/arcturian_ace = 15, /obj/item/storage/fancy/cigarettes/emeraldgreen = 15, /obj/item/storage/fancy/cigarettes/wypacket = 15, + /obj/item/storage/fancy/cigarettes/trading_card = 15, /obj/item/storage/fancy/cigarettes/lady_finger = 15, /obj/item/storage/fancy/cigarettes/blackpack = 10, /obj/item/storage/fancy/cigar/tarbacks = 5, + /obj/item/storage/box/matches = 10, /obj/item/tool/lighter/random = 20, /obj/item/tool/lighter/zippo = 5, + ) prices = list( /obj/item/storage/fancy/cigarettes/kpack = 40, /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, /obj/item/storage/fancy/cigarettes/emeraldgreen = 35, - /obj/item/storage/fancy/cigarettes/wypacket = 35, + /obj/item/storage/fancy/cigarettes/wypacket = 30, + /obj/item/storage/fancy/cigarettes/trading_card = 35, /obj/item/storage/fancy/cigarettes/lady_finger = 30, /obj/item/storage/fancy/cigarettes/blackpack = 75, /obj/item/storage/fancy/cigar/tarbacks = 35, /obj/item/storage/box/matches = 1, /obj/item/tool/lighter/random = 10, /obj/item/tool/lighter/zippo = 25, + ) /obj/structure/machinery/vending/security @@ -407,7 +412,7 @@ name = "\improper Rec-Vend" desc = "Contains Weyland-Yutani approved recreational items, like Walkmans and Cards." icon_state = "walkman" - product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!" + product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!;Say goodbye to the lucky strike military tobacco monopoly, with the new Weyland Yutani Military Trading Card Gold cigarette pack!" vend_delay = 0.5 SECONDS idle_power_usage = 200 @@ -436,6 +441,10 @@ /obj/item/tool/pen/blue = 10, /obj/item/tool/pen/red = 10, /obj/item/tool/pen/fountain = 3, + /obj/item/storage/fancy/cigarettes/trading_card = 20, + /obj/item/storage/fancy/trading_card = 20, + /obj/item/toy/trading_card = 50, + ) contraband = list(/obj/item/toy/sword = 2) @@ -463,6 +472,10 @@ /obj/item/tool/pen/blue = 2, /obj/item/tool/pen/red = 2, /obj/item/tool/pen/fountain = 30, + /obj/item/storage/fancy/cigarettes/trading_card = 30, + /obj/item/storage/fancy/trading_card = 20, + /obj/item/toy/trading_card = 5, + ) product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index de0a6568acb0..6a52b770387c 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -219,18 +219,41 @@ storage_slots = 4 /obj/item/storage/fancy/cigarettes/trading_card - name = "\improper Weyland-Yutani Trading Card Gold packet" - desc = "Gotta collect them all, and smoke them all! This fancy trading card collector version of Weyland Yutani Gold has one card that is apart of the 3 available 5-card sets." + name = "\improper Weyland-Yutani Gold Military Trading Card packet" + desc = "Gotta collect 'em all, and smoke 'em all! This fancy military trading card version of Weyland Yutani Gold cigarette packs has one card that is apart of the 3 available 5-card sets." icon_state = "collectpacket" item_state = "collectpacket" - var/has_card = 1 + storage_slots = 21 + can_hold = list( + /obj/item/clothing/mask/cigarette, + /obj/item/clothing/mask/cigarette/ucigarette, + /obj/item/clothing/mask/cigarette/bcigarette, + /obj/item/tool/lighter, + /obj/item/toy/trading_card + ) + var/obj/item/toy/trading_card/trading_card + +/obj/item/storage/fancy/cigarettes/trading_card/fill_preset_inventory() + flags_atom |= NOREACT + for(var/i = 1 to (storage_slots-1)) + new default_cig_type(src) + trading_card = new /obj/item/toy/trading_card(src) + +/obj/item/storage/fancy/cigarettes/trading_card/attack_hand(mob/user, mods) + if(trading_card?.loc == src && loc == user) + user.visible_message(SPAN_NOTICE("You pull a [trading_card.collection_color] trading card out of the cigarette pack.")) + //have to take two disparate systems n' ram 'em together + remove_from_storage(trading_card, user.loc) + user.put_in_hands(trading_card) + trading_card = null + + . = ..() /obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/W, mob/user) - if(!(W == attack_hand(user))) - return + if(istype(W, /obj/item/toy/trading_card)) + trading_card = W - if(has_card) - new /obj/item/toy/trading_card + . = ..() ///////////// //CIGAR BOX// @@ -426,3 +449,73 @@ /obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob) ..() update_icon() + +// Trading Card Pack + +/obj/item/storage/fancy/trading_card + name = "pack of Red Weyland Yutani Military Trading Cards" + desc = "A 5 pack of Red Weyland Yutani Military Trading Cards." + icon = 'icons/obj/items/playing_cards.dmi' + icon_state = "trading_red_pack_closed" + storage_slots = 5 + icon_type = "trading card" + can_hold = list(/obj/item/toy/trading_card) + foldable = /obj/item/stack/sheet/cardboard + var/collection_color = null + var/obj/item/toy/trading_card/top_trading_card + +/obj/item/storage/fancy/trading_card/Initialize() + if(!collection_color) + collection_color = pick("red", "green", "blue") // because of vodoo shenanigans with fill_preset_inventory happening during parent's initalize this'll have to run prior to that + + . = ..() + + name = "pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards" + desc = "A 5 pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards." + icon_state = "trading_[collection_color]_pack_closed" + + +/obj/item/storage/fancy/trading_card/fill_preset_inventory() + + for(var/i = 1, i <= storage_slots, i++) + top_trading_card = new /obj/item/toy/trading_card(src) + +/obj/item/storage/fancy/trading_card/update_icon() + if(!(top_trading_card)) + icon_state = "trading_[collection_color]_pack_empty" + return + if(length(contents) == 5) + icon_state = "trading_[collection_color]_pack_closed" + return + icon_state = "trading_[collection_color]_pack_open" + +/obj/item/storage/fancy/trading_card/attack_hand(mob/user, mods) + if(top_trading_card?.loc == src && loc == user) + user.visible_message(SPAN_NOTICE("You pull a [top_trading_card.collection_color] trading card out of the pack.")) + //have to take two disparate systems n' ram 'em together + remove_from_storage(top_trading_card, user.loc) + user.put_in_hands(top_trading_card) + if(!(length(contents))) + top_trading_card = null + update_icon() + return + top_trading_card = contents[(length(contents))] + update_icon() + return + + . = ..() + +/obj/item/storage/fancy/trading_card/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/toy/trading_card)) + top_trading_card = W + + . = ..() + +/obj/item/storage/fancy/trading_card/red + collection_color = "red" + +/obj/item/storage/fancy/trading_card/green + collection_color = "green" + +/obj/item/storage/fancy/trading_card/blue + collection_color = "blue" diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index cf553f6ad189..264f8dbfae19 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -1,14 +1,59 @@ /obj/item/toy/trading_card icon = 'icons/obj/items/playing_cards.dmi' + w_class = SIZE_TINY + var/trading_card_number = "1" - var/picture_description = "Barrel Charger" - var/collection_colour = "Red" + var/picture_description = "barrel charger" + var/collection_color = "red" + var/is_front = FALSE + var/back_name = "Red WeyYu Military Trading Card" + var/front_name = "Red WeyYu Military Trading Card Number One" + var/back_description = "The back of a red trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + var/front_description = "A red trading card with a picture of a barrel charger emblazoned on it. It is number one out of the five red cards." + var/back_icon_state = "trading_red" + var/front_icon_state = "trading_red_one" + var/picture_descriptions = list("5" = list("red" = "red dot sight", "green" = "protein bar", "blue" = "m2c ammo box"), + "4" = list("red" = "suppressor", "green" = "onigiri", "blue" = "m37 shotgun buckshot"), + "3" = list("red" = "magnetic harness", "green" = "sushi roll", "blue" = "m4ra magazine"), + "2" = list("red" = "angled grip", "green" = "chicken ribs", "blue" = "m4a1 magazine"), + "1" = list("red" = "barrel charger", "green" = "burger", "blue" = "m39 hollowpoint magazine") + ) + +/obj/item/toy/trading_card/Initialize() + . = ..() + + if(istype(src.loc, /obj/item/storage/fancy/trading_card)) + var/obj/item/storage/fancy/trading_card/packet = src.loc + collection_color = packet.collection_color + + if(!collection_color) + collection_color = pick("red", "green", "blue") + trading_card_number = pick_weight(list("5" = 2, "4" = 2, "3" = 2, "2" = 2, "1" = 1)) + picture_description = picture_descriptions[trading_card_number][collection_color] - name = " [collection_colour] WeyYu Trading Card #[trading_card_number]" + name = "[capitalize(collection_color)] WeyYu Military Trading Card" + back_name = "[capitalize(collection_color)] WeyYu Military Trading Card" + front_name = "[capitalize(collection_color)] WeyYu Military Trading Card #[trading_card_number]" - desc = "The back of a [collection_colour] trading card with the text: WeyYu Trading Cards! GOTTA COLLECT EM ALL!" - flipped_description = "A [collection_colour] trading card with a picture of a [picture_description] emblazoned on it. It is number [trading_card_number] out of the five [collection_colour] cards." + desc = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + back_description = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + front_description = "A [collection_color] trading card with a picture of a [picture_description] emblazoned on it. It is #[trading_card_number] out of the five [collection_color] cards." - icon_state = "trading_[collection_colour]" - flipped_icon_state = "trading_[collection_colour]_[trading_card_number]" + icon_state = "trading_[collection_color]" + back_icon_state = "trading_[collection_color]" + front_icon_state = "trading_[collection_color]_[trading_card_number]" +/obj/item/toy/trading_card/attack_self(mob/user) + if(loc == user) + if(is_front) + name = back_name + desc = back_description + icon_state = back_icon_state + is_front = FALSE + else + to_chat(user, "You reveal the card. It has a picture of a [picture_description] on it!") + name = front_name + desc = front_description + icon_state = front_icon_state + is_front = TRUE + . = ..() diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi index 4ff939e875667b6a3bf5df5d3e0da5d63ec29c0e..89b3ca2195fa9687bf147aebba3c90b7992bb4fb 100644 GIT binary patch delta 2016 zcmZ{idpOi-8^@nXNDk9F7TcgTZOSRe=tbkKu+un(afn0?4JlrYVy3Z4$oqj6?6Q+IRnWuWSGL-p}{GpX)=OHOoNm%C&&Ozsz{K2hDQ4oWF!VnAI%2 z#=!RQ3Fe3xPTx|~sM*zqQ{PvNM)T5nFK+(a6h$!nG#BQMe&FWo;~0AGKwf;PXH%Y= z?^#FcuO?zId+AZrCi%(k8463mpi1xEGnT4BRTUHvkeeVGT0BxGUXoS4jeew#rhh0i zzW)XTD|GXLYN*_7d`* zjoOM-ultPcUj9yCbGp=0>Q3%$E$Z?f9d`uTo+Vb&?Z=f?VW@Q?$a06QCz8>6}4{Do;9PSTL2jdeElmp z{xf(3>N9u5XYS!I+}H;FB&NR4NY}EKa;@cFNj0aU2$Fu=iyC@y%8{ZR#E{|jVvq-|eatW(=- z#QC^+VAt}vOW)~E%Do&#=>#NFq1wgS{{U951*IE%ImUhB?M&%!UGq>~Huo47|HQdw zQgQCC_d{fUus35^zg4+yBJbaQfq)FYky8X+I~xkl)^^$pUC7hZS#g~R9WoIu4TOA{<%3?ZDf$BRx2>EwwLCWrm@E+ zP3}UE{L#~fFl1weJRIQ)SW~BOZSv45J=(%pa?cXj+pMurSi_VHIBVHSzU0lNSQqSR!)gQ6S-wi|#SGyg%Ojb|ja@IU=< zcm@f;`Ls`D0Lbj)UzC_ATb@hmH}$ylBY)*q#tMtM=|XF!WL(t**pT5E9)4?O2*LYL`jhl9=&OYz^#nBj_6x3(=3J>1vLrX{r(k^pcloP}Me z848c7Ium2ZFl!DD^IC<0{ZT~*wpgTMKtasZczgAP6=qU_^F}!>X3ag zc5$LYy3IOnh9vdMP;h0SEDp~#2$x znY5?`&7x~^&TlrQ*XZRrPCY%ZWWD2EYoz}pO#+?DTrT+%H!^X1%SF6h-;69=xc;WP zy=pd9O?^FiQ=E?RDOU+srD&FnKP_u5{l+3^aiLL(Y4msW+wp9EmPN=I}z zhS_p#c8b%B4i*oIpry#2Cc#P@H=OQXP%70VKm(L4;aW|EU+I|9oqx??vy&U3h5F%x zC3$X9FOEPNS@V6>M7R;Wdb=JD$THQ^*)I$H;-e`|gecNQ?dHbtn{dY$PAPztoNZU~3sg4%#w;mjChF*^m|hKuVAafC2Dx$Uo>NyxClD*A*ko Q3+OU%ayVmOZ5u@SFCqWcuK)l5 delta 1783 zcmZuve>{_U9Dmk~BPHF{QVX|~E^QMklbE9XXxeF%li^6ZF2t6f+q1atNRcU1F5BH& zF7B3IlliS3LPcmIV#)Gji-pa)3HMNUf86Wduh;YWKJU--eLwHd_xpNFD`08muqzg@ z@$AiebTh}eV$`|p@Y5?EnvQqS-u5ilItT4d${sMaxMr$6*A&ue=Fq##e%0gaRfWNB zVg$l$Yx%8LCk+_C1aD-1?UG{-+X-ryU2Re%n%-3;R0~EXD+~T1#G}lq`25VKKC0uu z?V-tC8?!`X@zun_roKq&lMd6H1(8*BTgC>xAA1G&YvzSkw;~Ub0`s_)I2T%Aio8sx z>xBNr<2O6*Zgc1n+&g2A^Fxy3qC;rTSPeK8~pn=lHVHpVuM@0 zi04Ji&iI}eU6{bklvL`=4$4!nxYG?+-!XDQtBu`nIRWVswWSZ6;~q#y(o_++_&`UE^rS_LjQ++GCl$s ztBx%Cl1USw0d>h(@=Z_YqI_X#R1q{P15MMUOS&w5c0(i?O;di7Ln8fBNMit%iNykq zU7B9TSBgvms3lIHnf#u$PghZYMXa?CD{)!{QCD5X{%o=K7(~}qT(!C2w$gQOR-)%nquo*iSSUT@ zX8g(t&luEkwk$rx`c}gvKWY|W+$B+1Ey8l2-Bc~5fG5QFZPTL=`0g&)LBnhhO8ChT|aydhISuNSTlzX zi}9i~vd)H!Dsbzu74CW&<+IbO2d4VbO&Y{O1gOFpW!9wXAh=5yN{UGR@; zFy!jS&F19xjQZ>=p0Ta@waN`swVbC@oie`E%%5?1c1zT7XVyephMpP%vc&mWocIzh zjG|hkP(#E4ORbo;hzD7wc*-zSl|J19RXne zY4Sg%#zu)C2l6`dG^+t_^gMhS@I@N{6>Qh$ywvd65}#sXa&1?_Ca2la?&DF2fHzLS z)kX;%Z07l$j!rr=&L64P4)>i+8kfdPzFRRMl|H3@E=V*39);cB{R=}QYq^#Mu2UXp zcoWt3cz@R{P%?TOI;M86YPC;n!2zn9-Cx+jVo`wJJaaOmaF zLhH8+bphlB@2a^@DJKs4>FWcWlnV7biXW(GM=%XMb}|id`!5A$+AB1?dm`k?ImU;w zDWX6L=1DL`&UXUBAWg6w7RL9>sN*2p>>DvCn*uEc@ zHn5>6M%EhdU=z#bbYN?$1P(>&Y+|{Cwqo?(R`Xwz!+hfVr3|(thiCy34aWw3+W-In diff --git a/icons/obj/items/playing_cards.dmi b/icons/obj/items/playing_cards.dmi index b5c8d9d6c251ae9ae15074a1d3dd600db05e0d4d..cc8863aaea582d036210712a95bff6f6abe477f4 100644 GIT binary patch literal 7029 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 N;{j*87dC!L{|7}!O_l%v literal 6465 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 Date: Mon, 5 Feb 2024 02:59:58 +0000 Subject: [PATCH 03/14] vending fix --- code/game/objects/items/toys/trading_cards.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 264f8dbfae19..34e375b0dbf7 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -1,5 +1,7 @@ /obj/item/toy/trading_card + name = "WeyYu Military Trading Card" icon = 'icons/obj/items/playing_cards.dmi' + icon_state = "trading_red" w_class = SIZE_TINY var/trading_card_number = "1" From 3a4b9aebb48d9fb3c32fe0895f07900ebe368b0c Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Mon, 5 Feb 2024 03:02:50 +0000 Subject: [PATCH 04/14] Shortening --- code/game/objects/items/storage/fancy.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 6a52b770387c..697c6d242761 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -219,7 +219,7 @@ storage_slots = 4 /obj/item/storage/fancy/cigarettes/trading_card - name = "\improper Weyland-Yutani Gold Military Trading Card packet" + name = "\improper WeyYu Gold Military Trading Card packet" desc = "Gotta collect 'em all, and smoke 'em all! This fancy military trading card version of Weyland Yutani Gold cigarette packs has one card that is apart of the 3 available 5-card sets." icon_state = "collectpacket" item_state = "collectpacket" @@ -453,7 +453,7 @@ // Trading Card Pack /obj/item/storage/fancy/trading_card - name = "pack of Red Weyland Yutani Military Trading Cards" + name = "pack of Red WeyYu Military Trading Cards" desc = "A 5 pack of Red Weyland Yutani Military Trading Cards." icon = 'icons/obj/items/playing_cards.dmi' icon_state = "trading_red_pack_closed" @@ -470,7 +470,7 @@ . = ..() - name = "pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards" + name = "pack of [capitalize(collection_color)] WeyYu Military Trading Cards" desc = "A 5 pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards." icon_state = "trading_[collection_color]_pack_closed" From 246996387779ae8f80c714acb2947cde416e759a Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Mon, 5 Feb 2024 03:08:38 +0000 Subject: [PATCH 05/14] Bug fix --- code/game/objects/items/toys/trading_cards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 34e375b0dbf7..3e281c013f3c 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -6,7 +6,7 @@ var/trading_card_number = "1" var/picture_description = "barrel charger" - var/collection_color = "red" + var/collection_color var/is_front = FALSE var/back_name = "Red WeyYu Military Trading Card" var/front_name = "Red WeyYu Military Trading Card Number One" From da09f86aa7c588551abed244322fb959a43cef7c Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Fri, 9 Feb 2024 19:02:57 +0000 Subject: [PATCH 06/14] Icon changes --- code/game/objects/items/toys/trading_cards.dm | 18 +++++++++--------- icons/obj/items/playing_cards.dmi | Bin 7029 -> 6978 bytes 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 3e281c013f3c..17a57dc08354 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -11,14 +11,14 @@ var/back_name = "Red WeyYu Military Trading Card" var/front_name = "Red WeyYu Military Trading Card Number One" var/back_description = "The back of a red trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" - var/front_description = "A red trading card with a picture of a barrel charger emblazoned on it. It is number one out of the five red cards." + var/front_description = "A red trading card with a picture of the United Americas flag emblazoned on it. It is number one out of the five red cards." var/back_icon_state = "trading_red" var/front_icon_state = "trading_red_one" - var/picture_descriptions = list("5" = list("red" = "red dot sight", "green" = "protein bar", "blue" = "m2c ammo box"), - "4" = list("red" = "suppressor", "green" = "onigiri", "blue" = "m37 shotgun buckshot"), - "3" = list("red" = "magnetic harness", "green" = "sushi roll", "blue" = "m4ra magazine"), - "2" = list("red" = "angled grip", "green" = "chicken ribs", "blue" = "m4a1 magazine"), - "1" = list("red" = "barrel charger", "green" = "burger", "blue" = "m39 hollowpoint magazine") + var/picture_descriptions = list("5" = list("red" = "a Holy Order of the HEFA cultist", "green" = "General Delyla S. Vaughn (the Assistant Commandant of the United States Colonial Marines)", "blue" = "the Weyland Yutani logo"), + "4" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo"), + "3" = list("red" = "a UPPA minigunner", "green" = "Generale d'armee Felix Couture (the Commandant of the Canadian Colonial Armed Forces)", "blue" = "the Three World Empire flag"), + "2" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"), + "1" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag") ) /obj/item/toy/trading_card/Initialize() @@ -30,7 +30,7 @@ if(!collection_color) collection_color = pick("red", "green", "blue") - trading_card_number = pick_weight(list("5" = 2, "4" = 2, "3" = 2, "2" = 2, "1" = 1)) + trading_card_number = pick_weight(list("5" = 25, "4" = 20, "3" = 15, "2" = 10, "1" = 5)) picture_description = picture_descriptions[trading_card_number][collection_color] name = "[capitalize(collection_color)] WeyYu Military Trading Card" @@ -39,7 +39,7 @@ desc = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" back_description = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" - front_description = "A [collection_color] trading card with a picture of a [picture_description] emblazoned on it. It is #[trading_card_number] out of the five [collection_color] cards." + front_description = "A [collection_color] trading card with a picture of [picture_description] emblazoned on it. It is #[trading_card_number] out of the five [collection_color] cards." icon_state = "trading_[collection_color]" back_icon_state = "trading_[collection_color]" @@ -53,7 +53,7 @@ icon_state = back_icon_state is_front = FALSE else - to_chat(user, "You reveal the card. It has a picture of a [picture_description] on it!") + to_chat(user, "You reveal the card. It has a picture of [picture_description] on it!") name = front_name desc = front_description icon_state = front_icon_state diff --git a/icons/obj/items/playing_cards.dmi b/icons/obj/items/playing_cards.dmi index cc8863aaea582d036210712a95bff6f6abe477f4..e69286371ae0f554f2e08fd9f0ed198497a2da05 100644 GIT binary patch delta 6017 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 delta 6120 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 Z;~**j_9)OsM|x=wc<%6at8fXS{1@rDphExv From f00db40cd6e25f93374b8966e79184f250ca005a Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Fri, 9 Feb 2024 20:52:17 +0000 Subject: [PATCH 07/14] Fixes & Preferences Gear --- code/game/objects/items/toys/trading_cards.dm | 2 +- code/modules/client/preferences_gear.dm | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 17a57dc08354..1d2731963d9c 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -18,7 +18,7 @@ "4" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo"), "3" = list("red" = "a UPPA minigunner", "green" = "Generale d'armee Felix Couture (the Commandant of the Canadian Colonial Armed Forces)", "blue" = "the Three World Empire flag"), "2" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"), - "1" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag") + "1" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag",) ) /obj/item/toy/trading_card/Initialize() diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0c1a7a31b5e8..c822bedd0f7b 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -515,6 +515,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "Card, Uno Reverse - yellow" path = /obj/item/toy/handcard/uno_reverse_yellow +/datum/gear/toy/card/trading_card + display_name = "Card, random WeyYu Trading" + path = /obj/item/toy/trading_card + /datum/gear/toy/deck display_name = "Deck of cards, regular" path = /obj/item/toy/deck @@ -523,6 +527,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "Deck of cards, Uno" path = /obj/item/toy/deck/uno +/datum/gear/toy/trading_card + display_name = "Trading Card Packet" + path = /obj/item/storage/fancy/trading_card + /datum/gear/toy/d6 display_name = "Die, 6 sides" path = /obj/item/toy/dice From 9869705154a2e802cc760e2ca2132c8f4d045b45 Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Fri, 9 Feb 2024 20:57:10 +0000 Subject: [PATCH 08/14] Another comma fix --- code/game/objects/items/storage/fancy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 697c6d242761..5aca0a9d745b 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -229,7 +229,7 @@ /obj/item/clothing/mask/cigarette/ucigarette, /obj/item/clothing/mask/cigarette/bcigarette, /obj/item/tool/lighter, - /obj/item/toy/trading_card + /obj/item/toy/trading_card, ) var/obj/item/toy/trading_card/trading_card From 681f71318b083dbfbf641ca87cde4fd736003d5d Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:56:57 +0000 Subject: [PATCH 09/14] Update code/game/objects/items/toys/trading_cards.dm Co-authored-by: harryob --- code/game/objects/items/toys/trading_cards.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 1d2731963d9c..57aae1405da1 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -24,8 +24,8 @@ /obj/item/toy/trading_card/Initialize() . = ..() - if(istype(src.loc, /obj/item/storage/fancy/trading_card)) - var/obj/item/storage/fancy/trading_card/packet = src.loc + if(istype(loc, /obj/item/storage/fancy/trading_card)) + var/obj/item/storage/fancy/trading_card/packet = loc collection_color = packet.collection_color if(!collection_color) From 8ce79d5aa087f243e7496b64ca99128288cc106e Mon Sep 17 00:00:00 2001 From: Warfan1815 Date: Wed, 14 Feb 2024 15:06:09 +0000 Subject: [PATCH 10/14] Span notice --- code/game/objects/items/toys/trading_cards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 57aae1405da1..5d1743130258 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -53,7 +53,7 @@ icon_state = back_icon_state is_front = FALSE else - to_chat(user, "You reveal the card. It has a picture of [picture_description] on it!") + to_chat(user, SPAN_NOTICE("You reveal the card. It has a picture of [picture_description] on it!")) name = front_name desc = front_description icon_state = front_icon_state From 7e23219b7aecb8e9fbcc5344dcd1da793dd8f039 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:47:02 +0000 Subject: [PATCH 11/14] Update trading_cards.dm --- code/game/objects/items/toys/trading_cards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index 5d1743130258..dbff786248fb 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -53,7 +53,7 @@ icon_state = back_icon_state is_front = FALSE else - to_chat(user, SPAN_NOTICE("You reveal the card. It has a picture of [picture_description] on it!")) + to_chat(user, SPAN_NOTICE("You reveal the card. It has a picture of [picture_description] on it!")) name = front_name desc = front_description icon_state = front_icon_state From 7b3b09d89b7c0b55ce9917fd4e4a17fcbcc8e645 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:48:13 +0000 Subject: [PATCH 12/14] Apply suggestions from code review Co-authored-by: harryob --- code/game/objects/items/storage/fancy.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 5aca0a9d745b..152282c177dd 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -237,7 +237,7 @@ flags_atom |= NOREACT for(var/i = 1 to (storage_slots-1)) new default_cig_type(src) - trading_card = new /obj/item/toy/trading_card(src) + trading_card = new(src) /obj/item/storage/fancy/cigarettes/trading_card/attack_hand(mob/user, mods) if(trading_card?.loc == src && loc == user) @@ -249,9 +249,9 @@ . = ..() -/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/toy/trading_card)) - trading_card = W +/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/attacked_by_item, mob/user) + if(istype(attacked_by_item, /obj/item/toy/trading_card)) + trading_card = attacked_by_item . = ..() @@ -477,14 +477,14 @@ /obj/item/storage/fancy/trading_card/fill_preset_inventory() - for(var/i = 1, i <= storage_slots, i++) + for(var/i in 1 to storage_slots) top_trading_card = new /obj/item/toy/trading_card(src) /obj/item/storage/fancy/trading_card/update_icon() if(!(top_trading_card)) icon_state = "trading_[collection_color]_pack_empty" return - if(length(contents) == 5) + if(length(contents) == storage_slots) icon_state = "trading_[collection_color]_pack_closed" return icon_state = "trading_[collection_color]_pack_open" @@ -505,9 +505,9 @@ . = ..() -/obj/item/storage/fancy/trading_card/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/toy/trading_card)) - top_trading_card = W +/obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user) + if(istype(attackd_by_item, /obj/item/toy/trading_card)) + top_trading_card = attacked_by_item . = ..() From 501e314c5722a00389dcac7a4779372045178a03 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:05:42 +0000 Subject: [PATCH 13/14] Mr Harry typo'd --- code/game/objects/items/storage/fancy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 152282c177dd..f7f522022e44 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -506,7 +506,7 @@ . = ..() /obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user) - if(istype(attackd_by_item, /obj/item/toy/trading_card)) + if(istype(attacked_by_item, /obj/item/toy/trading_card)) top_trading_card = attacked_by_item . = ..() From 4cb1ed91239a3b2e54b088a5b905fe4e444a4a42 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:58:58 +0000 Subject: [PATCH 14/14] Apply suggestions from code review Co-authored-by: harryob --- code/game/objects/items/storage/fancy.dm | 8 ++++---- code/game/objects/items/toys/trading_cards.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index f7f522022e44..7ddf331cdeca 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -247,13 +247,13 @@ user.put_in_hands(trading_card) trading_card = null - . = ..() + return ..() /obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/attacked_by_item, mob/user) if(istype(attacked_by_item, /obj/item/toy/trading_card)) trading_card = attacked_by_item - . = ..() + return ..() ///////////// //CIGAR BOX// @@ -503,13 +503,13 @@ update_icon() return - . = ..() + return ..() /obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user) if(istype(attacked_by_item, /obj/item/toy/trading_card)) top_trading_card = attacked_by_item - . = ..() + return ..() /obj/item/storage/fancy/trading_card/red collection_color = "red" diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm index dbff786248fb..23a35abec45e 100644 --- a/code/game/objects/items/toys/trading_cards.dm +++ b/code/game/objects/items/toys/trading_cards.dm @@ -58,4 +58,4 @@ desc = front_description icon_state = front_icon_state is_front = TRUE - . = ..() + return ..()