From 3f6ed1c6f904466c6877aeba4b6e0a6c3b4a9496 Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Sun, 29 Oct 2023 00:14:12 +0200 Subject: [PATCH 1/6] Sprites and uplink --- .../code/game/objects/items/nsv13_plushes.dm | 5 +++++ .../code/game/objects/items/storage_items.dm | 8 ++++++++ nsv13/code/modules/uplink/uplink_items.dm | 8 ++++++++ nsv13/icons/obj/custom_plushes.dmi | Bin 1031 -> 1286 bytes 4 files changed, 21 insertions(+) diff --git a/nsv13/code/game/objects/items/nsv13_plushes.dm b/nsv13/code/game/objects/items/nsv13_plushes.dm index ab35636fe29..e5eaa672162 100644 --- a/nsv13/code/game/objects/items/nsv13_plushes.dm +++ b/nsv13/code/game/objects/items/nsv13_plushes.dm @@ -25,6 +25,11 @@ attack_verb = list("bumped", "rammed", "missiled") squeak_override = list('nsv13/sound/effects/fighters/autocannon.ogg'=1) +/obj/item/toy/plush/lfighter + name = "Syndicate light fighter plush" + desc = "An adorable stuffed toy shaped like a Su-818 Rapier light fighter with Syndicate livery." + icon_state = "synlightfighter" + /obj/item/toy/plush/transport name = "utility craft plush" desc = "An adorable stuffed toy shaped like a Su-437 Sabre utility vessel." diff --git a/nsv13/code/game/objects/items/storage_items.dm b/nsv13/code/game/objects/items/storage_items.dm index 50c2c0f8d3c..3e1d046fd4a 100644 --- a/nsv13/code/game/objects/items/storage_items.dm +++ b/nsv13/code/game/objects/items/storage_items.dm @@ -63,3 +63,11 @@ new /obj/item/clothing/gloves/maid(src) new /obj/item/clothing/under/costume/maid(src) +/obj/item/storage/box/syndie_kit/plushie + name = "\improper DIY plushbomb kit" + +/obj/item/storage/box/syndie_kit/plushie/PopulateContents() + new /obj/item/toy/plush/synlfigher + new /obj/item/kitchen/knife/combat/survival + new /obj/item/grenade/syndieminibomb + new /obj/item/screwdriver \ No newline at end of file diff --git a/nsv13/code/modules/uplink/uplink_items.dm b/nsv13/code/modules/uplink/uplink_items.dm index 2ea0e0785d9..fd5ac403f4c 100644 --- a/nsv13/code/modules/uplink/uplink_items.dm +++ b/nsv13/code/modules/uplink/uplink_items.dm @@ -23,3 +23,11 @@ cost = 20 cant_discount = TRUE surplus = 0 + +/datum/uplink_item/explosives/fighterplushie + name = "Plushie Bomb Kit" + desc = "A kit with all of the tools and items required to assemble your very own plushie bomb! \ + Take out the unsuspecting Nanotrasen scum with a gift they'll never expect. \ + Contains a Syndicate light fighter plush, syndicate minibomb, screwdriver and a survival knife" + item = /obj/item/storage/box/syndie_kit/plushie + cost = 8 diff --git a/nsv13/icons/obj/custom_plushes.dmi b/nsv13/icons/obj/custom_plushes.dmi index 07af6871b37f26acb758ef2d24bc132d094fe7a0..63b3474c15dc06ed9291c5e15bcbc59d96e96ecb 100644 GIT binary patch delta 1194 zcmV;b1XcTo2!;xOiBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUya!^cE zMZmzoR$Ot8kC-_;JtKCHyT!+VfPg%>rJbRqU0q#y_~uPbO;A;2FfTG_QZH4f+2AxZ zB1e8ddBM6RC3O)Rsv9ibTy3COSil!6ZU6wQA|k-Rz&kZDA3!-Eab!1>fIp~~Ns3aA zuVS=TH&{$fQkGz!0m$lT00001bW%=J06^y0W&i*Hj**6Ke_WYIlKPUO#Ju8y{Gt+q zDswaQGV{`LDN|N(^>YD-1pouOQB=L|7c&3=1E@(vK~z|U?N|+Sn=lN;CI(YXN$9$) zxj1~3{QtkWC%Ic&u+0ItyWLh12U4f+@gz$YNs@og#Gl5O3k*v)kS-A%;s`>;=hJL~ z;gBEV1bTs>e^?@TSRhz%VOs7b*sDO~aR8%DbiOL8IKiWQjN;2$#u%#dSjHK|DXKu| zI_jgeIL3V>bQ1*-s)?@CGUU1PIqne2?OT-^w}FiCufzba}o$cS|sP}M|MsE3yA?JrU)qn)$8sLpmr^)_*=A`8~MumVa!N=M3f zT+bAg7Xs!3a>}^^q1cQ&&1eJ)xfCc?2Jg6@e+4;xf&WWvIC#hPTtLGG$mOxtjaNpM z8XQ%y7FBPDclPvF9o%WUNSswv$kOnZwKPu_-*Ug~%l-y43+wcXW0xV(qVx7@_u)(b ze)}8$*539o2;OtU4EA=l*F6k^6+{SF!5#vM2au=&%2 ze{Ffb-AI7FKp)V19<=d>!P;xf^X+w07-%zhO}nJceU6XtBET@5w}?P5f`$jHh}s{| z)^9s7^jJkb@VoT{gsRc9DKv1@yH6PiwY3A@28*}#61XK1XdG27xHXv)0JXD2ck2dd z=~fd^>r4%arc9H@Oc`GLVI0Xhlxh7qe-8ah1_(gU<2oyW-e*Q|ANujmGFp2d`{Dk& zmH-{sdkmDB5ZHF?KE$9K*ZPQ_)38VzxTq2C!)Jn9OI4_ci+bxmtRtX0N6j-oUQm-h z3o@2JqD&!xl1&wl@j1`tYltZbpYv?}8v2C~=L^OCzb}(Ja=xWdY+|7LfX0=FaBo|q z`hYneo3=If5Uo+=_mNZ3Vr=!1Q(&9|&%9GmIRzW=>ETA=?rC@*b8N?Ver=ItgAef&|^zh_#{)qh|=0nq6?Tnn)z2LJ#707*qo IM6N<$g1iM9cK`qY delta 911 zcmV;A191F?3Wo?&iBL{Q4GJ0x0000DNk~Le0000$0000$2m=5B0G+pi>;M1&NKi~v zMZmzoR$Ot8kC-ENkGsXkJh-Kup`>~E=1^5+Xi_g#r`aM$em{A^pjcRueI6B{&C@3U z0004WQchCLQrLHW?p7qIxc0(3a)-GV7~zXgpER5 z#Q8zs0008mNklfpE0|jr|$K7YO4t_5u7Az}p4Dm5G-CR}5(CPY6Er0p8tzdspAhu8%;s zE(7v&-v;tacLMR!+(%Mzi_0&6#2~9W=Uo7UfZjP9C4fQg1JxB_PdqcB7ZH?VA{dNd zPy&-vWyV)c$gcuX%ydJT-ll-Q;FYbGRfE5wLGquzvn4-#@WdZO!_T7Nu(Aub4?z@h zG$E2IYELeXnOl)Ujsw7d(YOhKIdf|iVS0-X&TW2@G}&_fQ5nQ=9y|UkPwq_lX%5@&45@XNU zantdw0f1cKN7TO22h$BP-ZvfJ?xq_gS>~edBzYRkuMrM}ptndMS0mwL7bN`~sWt9E zIIs%`^!FM-v^+|G4x<1`Z7&f-Yl|lyXT+nXpedVB*mx#Q-IWD9);;%iKfz_M0HpLv z!uAqLE`$={^Eguy@)Ai$O6O4^fB^dlEKrfe8!cAEgiF6dW+&i1|n91S#Blg^==pTc0S|et1z_04C;%Qhkl1 zdJnP{yGD{C7~@*}QB_&%zZHqQ7$3zICW6Fo2tk{bmLz^tO4`h{q!!2?vTZ|Vu%WeV z$P7YeV2o!5DKjv}<#OV%x-|2e5_esF6$WNTpcfz5yYTdZol+c>aTUkIvH&(f8RGyj lEqMK>)Xr%d(Rlj-@(W&mAqFg30>=OV002ovPDHLkV1nUllqCQF From c504bfb8611e8885bc36458410febefa819ee7dd Mon Sep 17 00:00:00 2001 From: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:33:32 +0200 Subject: [PATCH 2/6] Update nsv13_plushes.dm Misspelled his ass --- nsv13/code/game/objects/items/nsv13_plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/game/objects/items/nsv13_plushes.dm b/nsv13/code/game/objects/items/nsv13_plushes.dm index e5eaa672162..fcecfbf3ddb 100644 --- a/nsv13/code/game/objects/items/nsv13_plushes.dm +++ b/nsv13/code/game/objects/items/nsv13_plushes.dm @@ -25,7 +25,7 @@ attack_verb = list("bumped", "rammed", "missiled") squeak_override = list('nsv13/sound/effects/fighters/autocannon.ogg'=1) -/obj/item/toy/plush/lfighter +/obj/item/toy/plush/synlfighter name = "Syndicate light fighter plush" desc = "An adorable stuffed toy shaped like a Su-818 Rapier light fighter with Syndicate livery." icon_state = "synlightfighter" From 407375fa07e721bdaa88ee4aca478ab3786f2527 Mon Sep 17 00:00:00 2001 From: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:33:53 +0200 Subject: [PATCH 3/6] Certified trailing newline moment --- nsv13/code/game/objects/items/storage_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/game/objects/items/storage_items.dm b/nsv13/code/game/objects/items/storage_items.dm index 3e1d046fd4a..b4a82d0cde0 100644 --- a/nsv13/code/game/objects/items/storage_items.dm +++ b/nsv13/code/game/objects/items/storage_items.dm @@ -70,4 +70,4 @@ new /obj/item/toy/plush/synlfigher new /obj/item/kitchen/knife/combat/survival new /obj/item/grenade/syndieminibomb - new /obj/item/screwdriver \ No newline at end of file + new /obj/item/screwdriver From 06ced396fa02358d7764d0a288acc2ebb3a93fef Mon Sep 17 00:00:00 2001 From: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> Date: Sun, 29 Oct 2023 12:25:03 +0100 Subject: [PATCH 4/6] t and (src) --- nsv13/code/game/objects/items/storage_items.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nsv13/code/game/objects/items/storage_items.dm b/nsv13/code/game/objects/items/storage_items.dm index b4a82d0cde0..64d354d1d94 100644 --- a/nsv13/code/game/objects/items/storage_items.dm +++ b/nsv13/code/game/objects/items/storage_items.dm @@ -67,7 +67,7 @@ name = "\improper DIY plushbomb kit" /obj/item/storage/box/syndie_kit/plushie/PopulateContents() - new /obj/item/toy/plush/synlfigher - new /obj/item/kitchen/knife/combat/survival - new /obj/item/grenade/syndieminibomb - new /obj/item/screwdriver + new /obj/item/toy/plush/synlfighter(src) + new /obj/item/kitchen/knife/combat/survival(src) + new /obj/item/grenade/syndieminibomb(src) + new /obj/item/screwdriver(src) From 9213bd12ffc8950ec4ceab498c54b95764acd38f Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Fri, 10 Nov 2023 22:51:01 +0100 Subject: [PATCH 5/6] Make it actually work! --- nsv13/code/game/objects/items/nsv13_plushes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/game/objects/items/nsv13_plushes.dm b/nsv13/code/game/objects/items/nsv13_plushes.dm index fcecfbf3ddb..e648207b27a 100644 --- a/nsv13/code/game/objects/items/nsv13_plushes.dm +++ b/nsv13/code/game/objects/items/nsv13_plushes.dm @@ -25,7 +25,7 @@ attack_verb = list("bumped", "rammed", "missiled") squeak_override = list('nsv13/sound/effects/fighters/autocannon.ogg'=1) -/obj/item/toy/plush/synlfighter +/obj/item/toy/plush/lfighter/synlfighter name = "Syndicate light fighter plush" desc = "An adorable stuffed toy shaped like a Su-818 Rapier light fighter with Syndicate livery." icon_state = "synlightfighter" From 234b765684241d44002e75f625aa9c12c013ecba Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Fri, 10 Nov 2023 22:59:03 +0100 Subject: [PATCH 6/6] AGH --- nsv13/code/game/objects/items/storage_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/game/objects/items/storage_items.dm b/nsv13/code/game/objects/items/storage_items.dm index 64d354d1d94..3bbae9f0c02 100644 --- a/nsv13/code/game/objects/items/storage_items.dm +++ b/nsv13/code/game/objects/items/storage_items.dm @@ -67,7 +67,7 @@ name = "\improper DIY plushbomb kit" /obj/item/storage/box/syndie_kit/plushie/PopulateContents() - new /obj/item/toy/plush/synlfighter(src) + new /obj/item/toy/plush/lfighter/synlfighter(src) new /obj/item/kitchen/knife/combat/survival(src) new /obj/item/grenade/syndieminibomb(src) new /obj/item/screwdriver(src)