cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10719 from AzuleUtama/ALittleC4KnockingAtYourDoor

Browse Source 
Changes to C4's explosion handling
This commit is contained in:
variableundefined
2019-01-26 09:04:36 +08:00
committed by GitHub
parent 9ab418366c 11b213d2a6
commit 39ae71ff87
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/explosives.dm
+11 -5
View File
@@ -135,13 +135,16 @@
var/turf/location
if(target)
if(!QDELETED(target))
location = get_turf(target)
if(istype(target, /turf/))
location = get_turf(target) // Set the explosion location to turf if planted directly on a wall or floor
else
location = get_atom_on_turf(target) // Otherwise, make sure we're blowing up what's on top of the turf
target.overlays -= image_overlay
else
location = get_turf(src)
location = get_atom_on_turf(src)
if(location)
location.ex_act(2, target)
explosion(location,0,0,3)
location.ex_act(2, target)
if(istype(target, /mob))
var/mob/M = target
M.gib()
@@ -162,10 +165,13 @@
var/turf/location
if(target)
if(!QDELETED(target))
location = get_turf(target)
if(istype(target, /turf/))
location = get_turf(target)
else
location = get_atom_on_turf(target)
target.overlays -= image_overlay
else
location = get_turf(src)
location = get_atom_on_turf(src)
if(location)
if(target && target.density)
var/turf/T = get_step(location, aim_dir)