getting closer to being ready

This commit is contained in:
Bawhoppen
2020-03-05 18:09:21 -06:00
185 changed files with 1093 additions and 511 deletions
+1
View File
@@ -53,6 +53,7 @@
return 0
/obj/effect/acid/Crossed(AM as mob|obj)
. = ..()
if(isliving(AM))
var/mob/living/L = AM
if(L.movement_type & FLYING)
+2
View File
@@ -107,6 +107,7 @@
O.throw_at(target, 5, 10)
/obj/effect/anomaly/grav/Crossed(atom/movable/AM)
. = ..()
gravShock(AM)
/obj/effect/anomaly/grav/Bump(atom/A)
@@ -154,6 +155,7 @@
mobShock(M)
/obj/effect/anomaly/flux/Crossed(atom/movable/AM)
. = ..()
mobShock(AM)
/obj/effect/anomaly/flux/Bump(atom/A)
+1
View File
@@ -11,6 +11,7 @@
to_chat(victim, "<span class='danger'>*click*</span>")
/obj/effect/mine/Crossed(AM as mob|obj)
. = ..()
if(isturf(loc))
if(ismob(AM))
var/mob/MM = AM
-1
View File
@@ -229,7 +229,6 @@
var/obj/projectile/P = M
P.ignore_source_check = TRUE
return TRUE
return FALSE
// try to search for a new one if something was var edited etc
set_linked()
. = ..()
+1
View File
@@ -112,4 +112,5 @@
/obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
set waitfor = FALSE
. = ..()
monitor.hasprox_receiver.HasProximity(AM)
@@ -461,6 +461,7 @@
icon_state = ""
layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/status = 0
var/delay = 0