TG sync Sunday (#201)
* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
This commit is contained in:
@@ -159,7 +159,7 @@
|
||||
flick("autolathe_r",src)//plays glass insertion animation
|
||||
user << "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.</span>"
|
||||
use_power(inserted*100)
|
||||
if(!qdeleted(O))
|
||||
if(!QDELETED(O))
|
||||
user.put_in_active_hand(O)
|
||||
else
|
||||
user << "<span class='notice'>You insert a material total of [inserted] to the autolathe.</span>"
|
||||
|
||||
@@ -382,7 +382,7 @@
|
||||
|
||||
/obj/machinery/clonepod/ex_act(severity, target)
|
||||
..()
|
||||
if(!qdeleted(src))
|
||||
if(!QDELETED(src))
|
||||
locked = FALSE
|
||||
go_out()
|
||||
|
||||
|
||||
@@ -71,17 +71,16 @@
|
||||
return
|
||||
|
||||
/obj/machinery/computer/aifixer/proc/Fix()
|
||||
. = use_power(1000)
|
||||
if(.)
|
||||
occupier.adjustOxyLoss(-1, 0)
|
||||
occupier.adjustFireLoss(-1, 0)
|
||||
occupier.adjustToxLoss(-1, 0)
|
||||
occupier.adjustBruteLoss(-1, 0)
|
||||
occupier.updatehealth()
|
||||
occupier.updatehealth()
|
||||
if(occupier.health >= 0 && occupier.stat == DEAD)
|
||||
occupier.revive()
|
||||
. = occupier.health < 100
|
||||
use_power(1000)
|
||||
occupier.adjustOxyLoss(-1, 0)
|
||||
occupier.adjustFireLoss(-1, 0)
|
||||
occupier.adjustToxLoss(-1, 0)
|
||||
occupier.adjustBruteLoss(-1, 0)
|
||||
occupier.updatehealth()
|
||||
occupier.updatehealth()
|
||||
if(occupier.health >= 0 && occupier.stat == DEAD)
|
||||
occupier.revive()
|
||||
return occupier.health < 100
|
||||
|
||||
/obj/machinery/computer/aifixer/process()
|
||||
if(..())
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/obj/structure/frame/computer
|
||||
name = "computer frame"
|
||||
icon_state = "0"
|
||||
anchored = 0
|
||||
state = 0
|
||||
|
||||
/obj/structure/frame/computer/attackby(obj/item/P, mob/user, params)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
icon = 'icons/obj/stock_parts.dmi'
|
||||
icon_state = "box_0"
|
||||
density = 1
|
||||
anchored = 1
|
||||
obj_integrity = 250
|
||||
max_integrity = 250
|
||||
var/obj/item/weapon/circuitboard/circuit = null
|
||||
|
||||
@@ -274,7 +274,7 @@ var/list/airlock_overlays = list()
|
||||
var/cont = 1
|
||||
while (cont)
|
||||
sleep(10)
|
||||
if(qdeleted(src))
|
||||
if(QDELETED(src))
|
||||
return
|
||||
cont = 0
|
||||
if(secondsMainPowerLost>0)
|
||||
@@ -1404,7 +1404,7 @@ var/list/airlock_overlays = list()
|
||||
operating = 1
|
||||
update_icon(AIRLOCK_EMAG, 1)
|
||||
sleep(6)
|
||||
if(qdeleted(src))
|
||||
if(QDELETED(src))
|
||||
return
|
||||
operating = 0
|
||||
if(!open())
|
||||
|
||||
@@ -305,7 +305,7 @@
|
||||
M.take_damage(DOOR_CRUSH_DAMAGE)
|
||||
|
||||
/obj/machinery/door/proc/autoclose()
|
||||
if(!qdeleted(src) && !density && !operating && !locked && !welded && autoclose)
|
||||
if(!QDELETED(src) && !density && !operating && !locked && !welded && autoclose)
|
||||
close()
|
||||
|
||||
/obj/machinery/door/proc/requiresID()
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
desc = "A strong door."
|
||||
icon = 'icons/obj/doors/windoor.dmi'
|
||||
icon_state = "left"
|
||||
layer = ABOVE_WINDOW_LAYER
|
||||
closingLayer = ABOVE_WINDOW_LAYER
|
||||
resistance_flags = ACID_PROOF
|
||||
var/base_state = "left"
|
||||
obj_integrity = 150 //If you change this, consider changing ../door/window/brigdoor/ health at the bottom of this .dm file
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
A.unbolt()
|
||||
spawn()
|
||||
if(A && A.close())
|
||||
if(stat & NOPOWER || lostPower || !A || qdeleted(A))
|
||||
if(stat & NOPOWER || lostPower || !A || QDELETED(A))
|
||||
goIdle(1)
|
||||
return
|
||||
A.bolt()
|
||||
@@ -209,7 +209,7 @@
|
||||
A.unbolt()
|
||||
spawn()
|
||||
if(A && A.open())
|
||||
if(stat | (NOPOWER) && !lostPower && A && !qdeleted(A))
|
||||
if(stat | (NOPOWER) && !lostPower && A && !QDELETED(A))
|
||||
A.bolt()
|
||||
goIdle(1)
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
user << "<span class='warning'>The panel must be closed before operating this machine!</span>"
|
||||
return
|
||||
|
||||
if(!linked_pad || qdeleted(linked_pad))
|
||||
if(!linked_pad || QDELETED(linked_pad))
|
||||
user << "<span class='warning'>There is no linked pad!</span>"
|
||||
return
|
||||
|
||||
@@ -112,14 +112,14 @@
|
||||
teleporting = 1
|
||||
|
||||
spawn(teleport_speed)
|
||||
if(!src || qdeleted(src))
|
||||
if(!src || QDELETED(src))
|
||||
teleporting = 0
|
||||
return
|
||||
if(stat & NOPOWER)
|
||||
user << "<span class='warning'>[src] is unpowered!</span>"
|
||||
teleporting = 0
|
||||
return
|
||||
if(!linked_pad || qdeleted(linked_pad) || linked_pad.stat & NOPOWER)
|
||||
if(!linked_pad || QDELETED(linked_pad) || linked_pad.stat & NOPOWER)
|
||||
user << "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>"
|
||||
teleporting = 0
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user