cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16477 from ChangelingRain/nukeproperly

Browse Source 
Nuke disc forcemoving properly removes it from storage items/mobs
This commit is contained in:
AnturK
2016-03-30 20:40:37 +02:00
parent f1d37f18d6 698bf19e50
commit d97c28cb68
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclearbomb.dm
+6
View File
@@ -433,6 +433,12 @@ This is here to make the tiles around the station mininuke change when it's arme
if(blobstart.len > 0)
var/turf/targetturf = get_turf(pick(blobstart))
var/turf/diskturf = get_turf(src)
if(ismob(loc))
var/mob/M = loc
M.remove_from_mob(src)
if(istype(loc, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = loc
S.remove_from_storage(src, diskturf)
forceMove(targetturf) //move the disc, so ghosts remain orbitting it even if it's "destroyed"
message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[diskturf.x];Y=[diskturf.y];Z=[diskturf.z]'>JMP</a>). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[targetturf.x];Y=[targetturf.y];Z=[targetturf.z]'>JMP</a>).")
log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([targetturf.x], [targetturf.y], [targetturf.z]).")