From 0c0c0a5485bdec9a2043127addf9788d589fe587 Mon Sep 17 00:00:00 2001
From: Michiyamenotehifunana
 <31995558+Michiyamenotehifunana@users.noreply.github.com>
Date: Mon, 5 Mar 2018 03:07:42 +0800
Subject: [PATCH] toys and stuff (#5772)

---
 .../temporary_visuals/projectiles/impact.dm   |   4 ++
 .../temporary_visuals/projectiles/muzzle.dm   |   4 ++
 .../temporary_visuals/projectiles/tracer.dm   |   4 ++
 .../code/modules/projectiles/guns/toys.dm     |  60 ++++++++++++++++++
 .../research/designs/autoylathe_designs.dm    |  24 +++++++
 .../icons/obj/guns/pumpactionblaster.dmi      | Bin 998 -> 1237 bytes
 modular_citadel/icons/obj/guns/toys.dmi       | Bin 0 -> 425 bytes
 .../icons/obj/projectiles_impact.dmi          | Bin 0 -> 405 bytes
 .../icons/obj/projectiles_muzzle.dmi          | Bin 0 -> 385 bytes
 .../icons/obj/projectiles_tracer.dmi          | Bin 0 -> 290 bytes
 tgstation.dme                                 |   4 ++
 11 files changed, 100 insertions(+)
 create mode 100644 modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
 create mode 100644 modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
 create mode 100644 modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
 create mode 100644 modular_citadel/code/modules/projectiles/guns/toys.dm
 create mode 100644 modular_citadel/icons/obj/guns/toys.dmi
 create mode 100644 modular_citadel/icons/obj/projectiles_impact.dmi
 create mode 100644 modular_citadel/icons/obj/projectiles_muzzle.dmi
 create mode 100644 modular_citadel/icons/obj/projectiles_tracer.dmi

diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
new file mode 100644
index 0000000000..20052c3351
--- /dev/null
+++ b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
@@ -0,0 +1,4 @@
+/obj/effect/projectile/impact/laser/wavemotion
+	name = "particle impact"
+	icon = 'modular_citadel/icons/obj/projectiles_impact.dmi'
+	icon_state = "impact_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
new file mode 100644
index 0000000000..5114cb223e
--- /dev/null
+++ b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -0,0 +1,4 @@
+/obj/effect/projectile/muzzle/laser/wavemotion
+	name = "particle backblast"
+	icon = 'modular_citadel/icons/obj/projectiles_muzzle.dmi'
+	icon_state = "muzzle_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
new file mode 100644
index 0000000000..8110fcabeb
--- /dev/null
+++ b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -0,0 +1,4 @@
+/obj/effect/projectile/tracer/laser/wavemotion
+	name = "particle trail"
+	icon = 'modular_citadel/icons/obj/projectiles_tracer.dmi'
+	icon_state = "tracer_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/modules/projectiles/guns/toys.dm b/modular_citadel/code/modules/projectiles/guns/toys.dm
new file mode 100644
index 0000000000..d6b80a95e5
--- /dev/null
+++ b/modular_citadel/code/modules/projectiles/guns/toys.dm
@@ -0,0 +1,60 @@
+/*
+// NEW TOYS GUNS GO HERE
+*/
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//HITSCAN EXPERIMENT
+
+/obj/item/gun/energy/pumpaction/toy
+	icon_state = "blastertoy"
+	name = "pump-action plastic blaster"
+	desc = "A fearsome toy of terrible power. It has the ability to fire beams of pure light in either dispersal mode or overdrive mode. Requires the operation of a 40KW power shunt between every shot to prepare the beam focusing chamber."
+	item_state = "particleblaster"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/guns_righthand.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/dispersal, /obj/item/ammo_casing/energy/laser/wavemotion)
+	ammo_x_offset = 2
+	modifystate = 1
+	selfcharge = TRUE
+	item_flags = NONE
+	clumsy_check = FALSE
+
+//PROJECTILES
+
+/obj/item/projectile/beam/lasertag/wavemotion
+	tracer_type = /obj/effect/projectile/tracer/laser/wavemotion
+	muzzle_type = /obj/effect/projectile/muzzle/laser/wavemotion
+	impact_type = /obj/effect/projectile/impact/laser/wavemotion
+	hitscan = TRUE
+
+/obj/item/projectile/beam/lasertag/dispersal
+	tracer_type = /obj/effect/projectile/tracer/laser/blue
+	muzzle_type = /obj/effect/projectile/muzzle/laser/blue
+	impact_type = /obj/effect/projectile/impact/laser/blue
+	hitscan = TRUE
+
+//AMMO CASINGS
+
+/obj/item/ammo_casing/energy/laser/wavemotion
+	projectile_type = /obj/item/projectile/beam/lasertag/wavemotion
+	select_name = "overdrive"
+	e_cost = 300
+	fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg'
+
+/obj/item/ammo_casing/energy/laser/dispersal
+	projectile_type = /obj/item/projectile/beam/lasertag/dispersal
+	select_name = "dispersal"
+	pellets = 5
+	variance = 25
+	e_cost = 200
+	fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg'
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//TOY REVOLVER
+
+/obj/item/toy/gun/justicar
+	name = "\improper replica F3 Justicar"
+	desc = "An authentic cap-firing reproduction of a F3 Justicar big-bore revolver! Pretend to blow your friend's brains out with this 100% safe toy! Satisfaction guaranteed!"
+	icon_state = "justicar"
+	icon = 'modular_citadel/icons/obj/guns/toys.dmi'
+	materials = list(MAT_METAL=2000, MAT_GLASS=250)
\ No newline at end of file
diff --git a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm b/modular_citadel/code/modules/research/designs/autoylathe_designs.dm
index a257513e96..f0e98a5bfe 100644
--- a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm
+++ b/modular_citadel/code/modules/research/designs/autoylathe_designs.dm
@@ -624,3 +624,27 @@
 	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
 	build_path = /obj/item/gun/ballistic/automatic/AM4C
 	category = list("initial", "Rifles")
+
+/datum/design/foam_f3
+	name = "Replica F3 Justicar"
+	id = "foam_f3"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/toy/gun/justicar
+	category = list("initial", "Pistols")
+
+/datum/design/toy_blaster
+	name = "pump-action plastic blaster"
+	id = "toy_blaster"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 750, MAT_GLASS = 1000)
+	build_path = /obj/item/gun/energy/pumpaction/toy
+	category = list("initial", "Rifles")
+
+/datum/design/capammo
+	name = "Box of Caps"
+	id = "capammo"
+	build_type = AUTOYLATHE
+	materials = list(MAT_METAL = 10, MAT_GLASS = 10)
+	build_path = /obj/item/toy/ammo/gun
+	category = list("initial", "Misc")
\ No newline at end of file
diff --git a/modular_citadel/icons/obj/guns/pumpactionblaster.dmi b/modular_citadel/icons/obj/guns/pumpactionblaster.dmi
index 7a34a398da519dca6bd03c3cc36931d316d9a7c7..363faf3c57c52afc37760686c6906d32d9f2ff2d 100644
GIT binary patch
delta 1206
zcmaFHew9<TGr-TCmrII^fq{Y7)59f*fq@aoWMtrA22$B;B0_*v-9%NxdP`lmo}L~P
zW2<@whW`v~8kzYk|NoCn@cMr*I?gL0JuPkB+O=LDffM@rswykbo<8m49kL*3_1)6{
zXU;He-ptV7&%m(hKg0B!47HmXQu^y=#Z>$f2id_`666=m;PC858jx*Q6%tY6l3JWx
zlvz-cnV-kNP%&riw7~pB3iTqb^G~l=_?6XD{A<T_*W{WR^#>Qk=n6(NpE+8uzvx=j
z_SWWQnM`N@?s#iyyCwIZ<vgGCnlGlQ)ka}cS^qz1&g)OL_u6&G|K4w%)1GUK%jZR?
z%lu5tUf5ci5~VZwR7CyL-c)VnZ6$K%ub)XTEiL(IB%bCgp*&TT+c$$>Wb?cF-44|b
zJ}>7^aC`eu{h;HmcXu9sf7Q6(D@x|ihWoN*S<fFEx#^hC2yb+l$}gajs!$Ng^sV3Q
z@GP^rrwgN9FLiNAPVC7}oKq5NI;oed>*}tXtj`wx$t*j#pu%}}t<VW|<)F2~^Cwob
zm?_w)e)niHJOA{_B(v~;j`nPqr_cLx<7d78)Q)@Eeiz=R9*eB_y~5NdY5lgx+h=XN
z8~TKMj!%#G?Edt{AH<7T_?Z?zh`lhkfq{W(x2KC^NX4ADceBeE83;5aPD;~#Bl|XW
z;;p5w7ytj~Hg_m_xTfURCZXJW>VKytOwN4pMdp!@2q^jkmsHi9Ppk5Jy;^&3I#XxE
zU+?<*tXV;~&a8WEar6J1@`LHu+iC>s4u=CN>B_(54}Zz8;|=iqvN_W;X8r!llcnym
zB)q#dq1B*K`g+?PuIu-Anmviz@o#!I^QP2Gm#q38Yy9(m>Uf9crt_tHzm8o|j99w%
zYSvWNjdjwE$B&#zTQ+gM+@(L|^JbUqtT|J2K1V5+p{Raok#vJju$p0KSftpgU$5I6
zYJc5)yUu6by1Vww`_xUB>a1p-u#IuX&w0J#UN>bIy!!fkUZ;84*RRS3cNk2{_wiXX
zy}f+?yA05GAn@P`*TVR!|MpiqCRYmmTKfHeaBoJttW5unw+BBKi+^Xow6p88%3I-=
zTTZ5~lLBb~rg|W7kpId5<#X|kpZur3T7Q!NVk;}+{`)!mar?rJ6+7$g;&&)I|1CCu
z()us0qdNHB+4_X*_a%Sb`onJ9dO`naU{$?-?Ei0dpX9In<bM@y|KbmOs$|8#=1n{{
z{~dSoL5aq@j8E(p{xkmMXR7`IiVPsASk7I)p5MUk|H0Pl>_7N_@<W8dq~neczZf3Z
zF8IZe{8@g^t(C8tMV$7}4+Ui{2zasBuHjzJp>_NLxx2qImhFzUP0IPlr1{@r{`FrB
zWq;=`%-ovEWMEd`IHi8U^EI!SbIK1bujTNqZTNNV|8_eEf!Fz$ABTt5KlsYHN(*S!
z)oWMTZ?HwlFSxbq7sJ%|H!BuSxyyKkeSsarS4M=3KP>rR%XojupFg&jzW+X6S6~0>
zGiSca++!Lobua%M`0`vB<~jxj1(C}k;uep8F$1ZJ)W1+KKiKk*A@YRn{9*@{qad{$
Mp00i_>zopr06MZSCIA2c

delta 965
zcmV;$13LWG3FZeSiBL{Q4GJ0x0000DNk~Le0002s0002s2m=5B04?*H(*OVfa*-u5
ze~gTbG&4GX009301}JH7ssI03U`qeqTW4lwuC1*~NKufEj(T}{&CAP7OH?^6Mxauw
zUP@ryb^pxF0JF0IkB<O;np|rqNhJUP00DGTPE!Ct=GbNc009hoR9JLGWpiV4X>fFD
zZ*Bkpc$}q`(F%ev6o#+eQw+NeDXYtFf1(I4@)csXla7|gwv67sG0Vy#b_@~D#`(^V
z|KZ00U98qgN|&32)S$GeN;;?0XhedG;HI#LNlbzQL|&NYpbax%%P^Bn8&Dw$xKP^O
zj7hLp><CTW?b{xNl-|v|f~g#E3>TVZ60jOrOq+9w)j%<o-2_*nMt=z&gyYFvf4_H6
z?JY=lwPhU5hA;2u7{zu6+^!sfb>2ZJD;<Hi#bH0ZnZ0;3yg$z=9QIIhk7PU={j6)d
zG1+J#U$46=XwGXtT@@VUztFBu5Ax55v~&D3@{XVv;GdFrq=z@Xax$Q+bm{&$H%|Wi
zEJ216{Qv+03Q0skRCt{2-CJ{_e=rmPU_)68dsVkvO6^`+{QtjkQPA3{G_%tSOZt7s
zw<KeZ0er~hFq;7Yq#-;o_H15W$g;DuY%fnF!*-=U>>`9LpPv^+x&Q1}@nauDK1IIa
zb00&#Jahclr-z4f_H7qsvCZ$OWszsQ1ebjbSw$xJy^kRmk?}wJ7;^dafAH$6>||L{
z6tm)9sFS!ztLw76_40h1;(F0puh&%)`L!9|l=*y~@6_w-Mg6m`^TpNGO*Qt+UPzZ<
z9YWnESXCh}^D+xnl}diwo3MSlw3lPZ>u}!x8IC=vmsC~T1Q%U`^RZ|1Dne*iFl_T1
zdnT`@&2IaMNjJgWotLGZe_{7@8G8-@0000a;#VI-en-Z~_6Ogp$Dlub47rVrkL?e>
zRgbRQ!83l5|5%z?0RR91001zSi-XhW7B3G@pG&+wIK6MWJUD&ga<zK8eYsrqU5471
zeV5bivD285)0WZQ;Nf$mo!I_fY<#R8000000GN_@P=EC9F75iGf6Zos^+zAt@6H|0
z-yPQ<ZSy<oI+gmP4?JFn_fdazd+Q}#f3#^5uRq!}iPs-(Hi_3CZ8nM5A8l7q{n3e2
ze-r=!0054}PLxf){%GX=eQDJn1poj50002)#opgH_4=c+oz$t<9|Zsa0001he-V3s
n-=q4Y6XX4U0000m7X^O-48kaPv?Iu*00000NkvXXu0mjfflS6Q

diff --git a/modular_citadel/icons/obj/guns/toys.dmi b/modular_citadel/icons/obj/guns/toys.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..3c8595f405b928be18f2574b11a3bbfa82709160
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000&P)t-sz`(#}
zVPR)tV$8zAt)!%mhlc=v{{U>+kBEq_rKK$`EqZix08E(xOqc*bflW<KHa0c@Y}i^_
zT0cKOOiWBZK0dhCPb~ld00DGTPE!Ct=GbNc003-yR9JLGWpiV4X>fFDZ*Bkpc$`yK
zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+
ztF*WzGdZzHiHkEOv#1y-WXQ#tR+N~V3SlcNxca$(O$Gp-A{%hr(lHSL005myL_t(I
zjqQ-p4udcVMJcrkSZC+v|NrVJ)lA*A@5}B}lXJMC0Q_@|E3r4?7w#>MI*1r{O52fh
zOjZ!Mq}d7#;+5+>_e+uYZd*^nD)bt1HXq|K+}>PdOl*isL+rYHyA`JKk(M3Ea%d<<
z%6MI|3Hy&`Lx4aFtOt*WC<4QJsE^3>oaK}*{0tUe6)rhQr9dw^Ukh2O2tS?|cXI~r
TY)T%L00000NkvXXu0mjf+u^Nm

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/projectiles_impact.dmi b/modular_citadel/icons/obj/projectiles_impact.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1d798b5e9ea79df4133149bed135d82b8b2a6cd7
GIT binary patch
literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001ZdQ@0+L}hbh
za%pgMX>V=-0C=1w$1x6rFboCIIX=Y~?1)m<ELBjI0j_|eVj2%2Rbs*QJFvai;x)bf
z0yld)xm3vqEXJ-UbIGO=7SDl9WcfzDQ#B~VqLK6qA6>6-a>^?CXvl0*Dl8sk_7W1`
zZZRzmZuayC-lZQg8p@?*0002kNkl<ZScUD@I}U<C5P;!-ji<2i5XOGi-ooD2%2RL<
zTY3w7cYDJjEZ`W}EMa-5NHkc?BqaM_XFgsVjB}1DV>W4Z1t>rP3Q)j50On&Cibxsv
zz4zwlfVilEqO9AL(cCAP!H>X-<OYiBXwS!URwN&q*Sz~5c$F-^1JA;FzZeCu*Pg=3
zKtR$S0JrIf^a5-uIdBG`TDApX#TtO+6TqDt02!AsQeVc-?YoH1JJ2Zp-8hHbjp%#@
zvC^h;2+h^VqFKm!3jJgIgvmD|1t>rP3Q)iUjvzrZPAtRt00000NkvXXu0mjfwF9i^

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/projectiles_muzzle.dmi b/modular_citadel/icons/obj/projectiles_muzzle.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..2116b0559c6526dd8e6f790090bf6c10ea7c6770
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001bdQ@0+L}hbh
za%pgMX>V=-0C=1w$FT~7Fc1ddIrkJlx|g=PW+{=9L0_Q+Jk3F4Ah{~|^c~#3uf=P4
z`w4FJv~#JFH(2zyJDEdfjj-sRWFpHN^-9&C42vfH&hyKkBkY{AO5PeWvy=*p2braW
z#FtwPlY<*Q{Q>5XA6o7_c-{a20K!Q`K~z|U?bp2x!Y~kq;n#?c4Ja7GLLyy~o(<Ac
zF%vBtFu=J-3_$@CP(#5XB#@0s0!ndT<0AL-6j2mA5h0dpTdtS_;92T92Ve$p)jIcV
zIkE@fz)sH-NE0@(9i!;>Kg9qBFn|FJU;qOcVDJFn!;a*PBtV+5?uhU@qa6T1>edLa
zy~$*~15$_LON7^+j~VAqluIb8N%{B_KS#<ITI(Xu-{MmDf>^5Z4tc#7NXTE@3D9Q-
f{~a)Z0e+qv$o4HXk>Op@00000NkvXXu0mjfd6l7z

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/projectiles_tracer.dmi b/modular_citadel/icons/obj/projectiles_tracer.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e26e8501f1dbe3f30f1a566b3a81172cb9016c9c
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ@~V)C5|`BC<f6=ilFa-(28N0`
zs>coanhkhZFId_g6@L?&8M!&cQG+>VVOLkCjf2YZrq{+B_FjKv+*9Z_LrHc`=qbMb
ze;-xKPbEppy%*nk=F|DI<xxg$?#Z+2*4#Ii-6J}Allc>|i(LJEcUEOSzOCD4so*nF
z?|!hniBYP3KhOzjo-U3d5v^~}E#z%*5OBFzKc#U2M^ih~3kL7V2&)ARM}@l_F0jq;
z4oDBIKQrU*8E-*H&BM3OUt!qNv(uVEszLq!()UjvF+4~)UF+=gJLuMmuGjXi4GfG-
hEF1y~4p7DirZN%UhR^vi^ME!oc)I$ztaD0e0su9qZ#n<~

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index dd980eeb88..87e81d16b7 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2558,6 +2558,9 @@
 #include "modular_citadel\code\game\machinery\computer\card.dm"
 #include "modular_citadel\code\game\objects\ids.dm"
 #include "modular_citadel\code\game\objects\tools.dm"
+#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\impact.dm"
+#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\muzzle.dm"
+#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm"
 #include "modular_citadel\code\game\objects\items\handcuffs.dm"
 #include "modular_citadel\code\game\objects\items\holy_weapons.dm"
 #include "modular_citadel\code\game\objects\items\stunsword.dm"
@@ -2628,6 +2631,7 @@
 #include "modular_citadel\code\modules\mob\living\simple_animal\kiwi.dm"
 #include "modular_citadel\code\modules\power\lighting.dm"
 #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm"
+#include "modular_citadel\code\modules\projectiles\guns\toys.dm"
 #include "modular_citadel\code\modules\projectiles\guns\ballistic\revolver.dm"
 #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm"
 #include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm"