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 7a34a398da..363faf3c57 100644 Binary files a/modular_citadel/icons/obj/guns/pumpactionblaster.dmi and b/modular_citadel/icons/obj/guns/pumpactionblaster.dmi differ diff --git a/modular_citadel/icons/obj/guns/toys.dmi b/modular_citadel/icons/obj/guns/toys.dmi new file mode 100644 index 0000000000..3c8595f405 Binary files /dev/null and b/modular_citadel/icons/obj/guns/toys.dmi differ diff --git a/modular_citadel/icons/obj/projectiles_impact.dmi b/modular_citadel/icons/obj/projectiles_impact.dmi new file mode 100644 index 0000000000..1d798b5e9e Binary files /dev/null and b/modular_citadel/icons/obj/projectiles_impact.dmi differ diff --git a/modular_citadel/icons/obj/projectiles_muzzle.dmi b/modular_citadel/icons/obj/projectiles_muzzle.dmi new file mode 100644 index 0000000000..2116b0559c Binary files /dev/null and b/modular_citadel/icons/obj/projectiles_muzzle.dmi differ diff --git a/modular_citadel/icons/obj/projectiles_tracer.dmi b/modular_citadel/icons/obj/projectiles_tracer.dmi new file mode 100644 index 0000000000..e26e8501f1 Binary files /dev/null and b/modular_citadel/icons/obj/projectiles_tracer.dmi differ 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"