cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted a bunch of stuff to the new thing (#27556)

Browse Source 
* removed old on_density_change thing

* converted on_resist to lazy events

* Converted on_spellcast to lazy events

* Converted on_uattack to lazy events, breaks spell channeling

* Converted on_ruattack to lazy events, unbreaks channeled spells

* Converted on_logout to lazy events

* Converted on_damaged to lazy_events

* Converted on_death to lazy_events

* Converted on_clickon to lazy_events

* Converted on_attackhand to lazy_events, added on_bumped
This commit is contained in:
DamianX
2020-08-16 18:53:17 +02:00
committed by GitHub
parent 15555e1092
commit 09a73d3c59
31 changed files with 192 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mob/living/living.dm
View File

@@ -18,8 +18,6 @@
immune_system = new (src)
on_resist = new(owner = src)
/mob/living/Destroy()
for(var/mob/living/silicon/robot/mommi/MoMMI in player_list)
for(var/image/I in static_overlays)
@@ -44,10 +42,6 @@
qdel(immune_system)
immune_system = null
if(on_resist)
qdel(on_resist)
on_resist = null
. = ..()
/mob/living/examine(var/mob/user, var/size = "", var/show_name = TRUE, var/show_icon = TRUE) //Show the mob's size and whether it's been butchered
@@ -250,7 +244,7 @@
if(status_flags & GODMODE)
return 0 //godmode
if(INVOKE_EVENT(on_damaged, list("type" = BRUTE, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = BRUTE, "amount" = amount)))
return 0
bruteloss = min(max(bruteloss + (amount * brute_damage_modifier), 0),(maxHealth*2))
@@ -262,7 +256,7 @@
if(status_flags & GODMODE)
return 0 //godmode
if(INVOKE_EVENT(on_damaged, list("type" = OXY, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = OXY, "amount" = amount)))
return 0
oxyloss = min(max(oxyloss + (amount * oxy_damage_modifier), 0),(maxHealth*2))
@@ -279,7 +273,7 @@
if(status_flags & GODMODE)
return 0 //godmode
if(INVOKE_EVENT(on_damaged, list("type" = TOX, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = TOX, "amount" = amount)))
return 0
var/mult = 1
@@ -303,7 +297,7 @@
return 0 //godmode
if(mutations.Find(M_RESIST_HEAT))
return 0
if(INVOKE_EVENT(on_damaged, list("type" = BURN, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = BURN, "amount" = amount)))
return 0
fireloss = min(max(fireloss + (amount * burn_damage_modifier), 0),(maxHealth*2))
@@ -315,7 +309,7 @@
if(status_flags & GODMODE)
return 0 //godmode
if(INVOKE_EVENT(on_damaged, list("type" = CLONE, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = CLONE, "amount" = amount)))
return 0
if(ishuman(src))
@@ -337,7 +331,7 @@
if(status_flags & GODMODE)
return 0 //godmode
if(INVOKE_EVENT(on_damaged, list("type" = BRAIN, "amount" = amount)))
if(lazy_invoke_event(/lazy_event/on_damaged, list("kind" = BRAIN, "amount" = amount)))
return 0
brainloss = min(max(brainloss + (amount * brain_damage_modifier), 0),(maxHealth*2))
@@ -777,9 +771,6 @@ Thanks.
hook.override_starting_X--
hook.override_target_X--
/mob/living
var/event/on_resist
/mob/living/verb/resist()
set name = "Resist"
set category = "IC"
@@ -787,7 +778,7 @@ Thanks.
if(!isliving(usr) || usr.special_delayer.blocked())
return
INVOKE_EVENT(on_resist, list())
lazy_invoke_event(/lazy_event/on_resist, list("user" = src))
delayNextSpecial(10) // Special delay, a cooldown to prevent spamming too much.