cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

C4 now properly explodes when an assembly is attached. (#22197)

Browse Source 
* Changes assemblyholder to assembly in C4

* Minor change when planting C4 with assembly

* Update code/game/objects/items/weapons/explosives.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Adrer
2023-09-13 21:06:01 +01:00
committed by GitHub
co-authored by Luc Adrer
parent 125a84514a
commit f84bbf85b9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/explosives.dm
+4 -4
View File
@@ -10,7 +10,7 @@
toolspeed = 1
var/atom/target = null
var/image_overlay = null
var/obj/item/assembly_holder/nadeassembly = null
var/obj/item/assembly/nadeassembly = null
var/assemblyattacher
/obj/item/grenade/plastic/Initialize(mapload)
@@ -23,8 +23,8 @@
return ..()
/obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params)
if(!nadeassembly && istype(I, /obj/item/assembly_holder))
var/obj/item/assembly_holder/A = I
if(!nadeassembly && istype(I, /obj/item/assembly))
var/obj/item/assembly/A = I
if(!user.unEquip(I))
return ..()
nadeassembly = A
@@ -71,7 +71,7 @@
if(isobserver(AM))
to_chat(user, "<span class='warning'>Your hand just phases through [AM]!</span>")
return
to_chat(user, "<span class='notice'>You start planting [src]. The timer is set to [det_time]...</span>")
to_chat(user, "<span class='notice'>You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time]..." : ""]</span>")
if(do_after(user, 50 * toolspeed, target = AM))
if(!user.unEquip(src))