mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Changed the embed check to use its own var instead of checking damagetype
* var/embed = 0 * The bullets the detective's revoler uses (weakbullet) will no longer embed into anything.
This commit is contained in:
@@ -50,6 +50,7 @@
|
||||
var/drowsy = 0
|
||||
var/agony = 0
|
||||
|
||||
var/embed = 0 // whether or not the projectile can embed itself in the mob
|
||||
|
||||
proc/on_hit(var/atom/target, var/blocked = 0)
|
||||
if(blocked >= 2) return 0//Full block
|
||||
|
||||
@@ -5,16 +5,18 @@
|
||||
damage_type = BRUTE
|
||||
nodamage = 0
|
||||
flag = "bullet"
|
||||
embed = 1
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
if (..(target, blocked))
|
||||
var/mob/living/L = target
|
||||
shake_camera(L, 3, 2)
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet
|
||||
/obj/item/projectile/bullet/weakbullet // "rubber" bullets
|
||||
damage = 10
|
||||
stun = 5
|
||||
weaken = 5
|
||||
embed = 0
|
||||
|
||||
|
||||
/obj/item/projectile/bullet/midbullet
|
||||
@@ -48,6 +50,7 @@
|
||||
stun = 10
|
||||
weaken = 10
|
||||
stutter = 10
|
||||
embed = 0
|
||||
|
||||
/obj/item/projectile/bullet/a762
|
||||
damage = 25
|
||||
@@ -4,6 +4,7 @@
|
||||
icon_state = "ice_1"
|
||||
damage = 20
|
||||
flag = "energy"
|
||||
embed = 1
|
||||
|
||||
/obj/item/projectile/forcebolt/strong
|
||||
name = "force bolt"
|
||||
|
||||
Reference in New Issue
Block a user