cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attack chain migration: structures. (#30365)

Browse Source 
* Attack chain migration: structures.

* whoops

* wth
This commit is contained in:
warriorstar-orion
2025-09-14 15:21:36 -04:00
committed by GitHub
parent cd7b4e7292
commit 3208049a8a
87 changed files with 1396 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/golem.dm
+4 -7
View File
@@ -764,12 +764,9 @@
cloth_golem = null
qdel(src)
/obj/structure/cloth_pile/attackby__legacy__attackchain(obj/item/P, mob/living/carbon/human/user, params)
. = ..()
if(resistance_flags & ON_FIRE)
return
if(P.get_heat())
/obj/structure/cloth_pile/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(!(resistance_flags & ON_FIRE) && used.get_heat())
visible_message("<span class='danger'>[src] bursts into flames!</span>")
fire_act()
return ITEM_INTERACT_COMPLETE
code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+4 -5
View File
@@ -296,16 +296,15 @@ While using this makes the system rely on OnFire, it still gives options for tim
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild))
H.color = "#FF0000"
/obj/structure/elite_tumor/attackby__legacy__attackchain(obj/item/attacking_item, mob/user, params)
. = ..()
if(istype(attacking_item, /obj/item/organ/internal/regenerative_core) && activity == TUMOR_INACTIVE && !boosted)
var/obj/item/organ/internal/regenerative_core/core = attacking_item
/obj/structure/elite_tumor/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(istype(used, /obj/item/organ/internal/regenerative_core) && activity == TUMOR_INACTIVE && !boosted)
var/obj/item/organ/internal/regenerative_core/core = used
visible_message("<span class='warning'>As [user] drops the core into [src], [src] appears to swell.</span>")
icon_state = "advanced_tumor"
boosted = TRUE
set_light(6)
qdel(core)
return TRUE
return ITEM_INTERACT_COMPLETE
/obj/structure/elite_tumor/examine(mob/user)
. = ..()
code/modules/mob/mob_grab.dm
+2 -1
View File
@@ -186,7 +186,8 @@
hud.screen_loc = UI_RHAND
else
hud.screen_loc = UI_LHAND
assailant.client.screen += hud
if(assailant.client)
assailant.client.screen += hud
/obj/item/grab/process()
if(!confirm())