Merge pull request #13437 from timothyteakettle/turret-fix

turrets will now break instead of magically poofing out of existence
This commit is contained in:
silicons
2020-09-27 00:35:06 -07:00
committed by GitHub
3 changed files with 3 additions and 0 deletions
+1
View File
@@ -381,6 +381,7 @@ Class Procs:
/obj/machinery/obj_break(damage_flag)
if(!(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
return TRUE
/obj/machinery/contents_explosion(severity, target)
if(occupant)
@@ -300,6 +300,7 @@
else
to_chat(user, "<span class='notice'>You remove the turret but did not manage to salvage anything.</span>")
qdel(src)
return
else if((istype(I, /obj/item/wrench)) && (!on))
if(raised)
@@ -151,6 +151,7 @@
turret.installation = installed_gun.type
turret.setup(installed_gun)
qdel(src)
return
else if(istype(I, /obj/item/crowbar))
I.play_tool_sound(src, 75)