cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attack Chain Migration: Grenades & Plastic Explosives (#31874)

Browse Source 
* Update bomb.dm

* migration

* Fix CI

* Update mining_charges.dm

* Update deployable.dm
This commit is contained in:
CRUNCH
2026-04-21 05:58:44 +01:00
committed by GitHub
parent fd45dc8718
commit 3c1d985e31
10 changed files with 252 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/modules/modules_security.dm
+8 -9
View File
@@ -66,7 +66,7 @@
if(!.)
return
var/obj/item/grenade/mirage/grenade = .
grenade.attack_self__legacy__attackchain(mod.wearer)
grenade.activate_self(mod.wearer)
/obj/item/grenade/mirage
name = "mirage grenade"
@@ -76,14 +76,13 @@
/// Mob that threw the grenade.
var/mob/living/thrower
/obj/item/grenade/mirage/Destroy()
thrower = null
return ..()
/obj/item/grenade/mirage/attack_self__legacy__attackchain(mob/user)
. = ..()
/obj/item/grenade/mirage/activate_self(mob/user)
thrower = user
return ..()
/obj/item/grenade/mirage/prime()
do_sparks(rand(3, 6), FALSE, src)
@@ -191,7 +190,7 @@
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
drain_power(use_power_cost)
var/obj/item/grenade/grenade = dispensed
grenade.attack_self__legacy__attackchain(mod.wearer)
grenade.activate_self(mod.wearer)
return grenade
/obj/item/mod/module/anomaly_locked/firewall/prebuilt
@@ -245,7 +244,7 @@
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
drain_power(use_power_cost)
var/obj/item/grenade/grenade = dispensed
grenade.attack_self__legacy__attackchain(mod.wearer)
grenade.activate_self(mod.wearer)
return grenade
/obj/item/mod/module/anomaly_locked/cryogrenade/prebuilt
@@ -267,9 +266,9 @@
thrower = null
return ..()
/obj/item/grenade/cryogrenade_mod/attack_self__legacy__attackchain(mob/user)
. = ..()
/obj/item/grenade/cryogrenade_mod/activate_self(mob/user)
thrower = user
return ..()
/obj/item/grenade/cryogrenade_mod/prime()
update_mob()
@@ -302,4 +301,4 @@
var/obj/item/grenade/smokebomb/grenade = ..()
if(!grenade)
return
grenade.attack_self__legacy__attackchain(mod.wearer)
grenade.activate_self(mod.wearer)