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

Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun

Browse Source 
Plastic Explosives Update
This commit is contained in:
Fox McCloud
2016-07-16 04:07:12 -04:00
committed by GitHub
parent 944a4ea629 23a1d887f3
commit b76e2d19e0
20 changed files with 222 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/frames.dm
+2 -7
View File
@@ -224,7 +224,7 @@
explosive.forceMove(user.loc)
explosive = null
qdel(src)
if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4))
if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/grenade/plastic/c4))
if(explosive)
to_chat(user, "<span class='warning'>There is already a device attached behind \the [src], remove it first.</span>")
return 1
@@ -268,11 +268,6 @@
var/obj/item/weapon/grenade/G = explosive
explosive = null
G.prime()
else if(istype(explosive, /obj/item/weapon/c4))
var/obj/item/weapon/c4/C = explosive
explosive = null
C.target = get_step(get_turf(src), dir)
C.explode(get_turf(loc))
/obj/structure/sign/picture_frame/proc/toggle_tilt(mob/user)
if(!isliving(usr) || usr.stat)
@@ -312,4 +307,4 @@
/obj/structure/sign/picture_frame/hear_message(mob/living/M as mob, msg)
..()
for(var/obj/O in contents)
O.hear_message(M, msg)
O.hear_message(M, msg)