toys and stuff (#5772)

This commit is contained in:
Michiyamenotehifunana
2018-03-05 03:07:42 +08:00
committed by Poojawa
parent d3905c723f
commit 0c0c0a5485
11 changed files with 100 additions and 0 deletions
@@ -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"
@@ -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"
@@ -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"
@@ -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)
@@ -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")
Binary file not shown.

Before

Width:  |  Height:  |  Size: 998 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

+4
View File
@@ -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"