This commit is contained in:
Ghommie
2020-01-12 16:54:08 +01:00
parent 8c50b578b4
commit 02fbbd4f95
81 changed files with 304 additions and 235 deletions

View File

@@ -66,6 +66,7 @@ obj/item/projectile/bullet/c10mm/soporific
knockdown = 0
/obj/item/projectile/bullet/c10mm/soporific/on_hit(atom/target, blocked = FALSE)
. = ..()
if((blocked != 100) && isliving(target))
var/mob/living/L = target
L.blur_eyes(6)
@@ -73,7 +74,6 @@ obj/item/projectile/bullet/c10mm/soporific
L.Sleeping(300)
else
L.adjustStaminaLoss(25)
return 1
/obj/item/ammo_casing/c10mm/soporific
name = ".10mm soporific bullet casing"

View File

@@ -355,7 +355,7 @@
damage = 10
armour_penetration = 10
stamina = 10
forcedodge = TRUE
movement_type = FLYING | UNSTOPPABLE
range = 6
light_range = 1
light_color = LIGHT_COLOR_RED
@@ -363,14 +363,14 @@
/obj/item/projectile/bullet/mags/hyper/inferno
icon_state = "magjectile-large"
stamina = 0
forcedodge = FALSE
movement_type = FLYING | UNSTOPPABLE
range = 25
light_range = 4
/obj/item/projectile/bullet/mags/hyper/inferno/on_hit(atom/target, blocked = FALSE)
..()
explosion(target, -1, 1, 2, 4, 5)
return 1
return BULLET_ACT_HIT
///ammo casings///
@@ -436,7 +436,7 @@
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-toy"
name = "lasertag magbolt"
forcedodge = TRUE //for penetration memes
movement_type = FLYING | UNSTOPPABLE //for penetration memes
range = 5 //so it isn't super annoying
light_range = 2
light_color = LIGHT_COLOR_YELLOW

View File

@@ -9,7 +9,7 @@
/obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE
..()
explosion(target, -1, -1, 2, 0, -1)
return 1
return BULLET_ACT_HIT
/obj/item/ammo_casing/caseless/spinfusor
name = "spinfusor disk"