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

chameleon flag fix

Browse Source
This commit is contained in:
Certhic
2020-09-04 13:47:16 +02:00
parent 6710bfef9e
commit dd8740d3df
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/flag.dm
+8 -2
View File
@@ -251,6 +251,7 @@
message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
burn()
else
return ..()
@@ -267,8 +268,13 @@
/obj/item/flag/chameleon/burn()
if(boobytrap)
boobytrap.prime()
..()
fire_act()
spawn(boobytrap.det_time)
boobytrap.loc = get_turf(loc)
boobytrap.prime()
..()
else
..()
/obj/item/flag/chameleon/updateFlagIcon()
icon_state = updated_icon_state