Does the rest of the if()'s/ else's

This commit is contained in:
Firecage
2016-01-17 19:03:12 +02:00
parent 754491ce4c
commit 332bde0f4f
186 changed files with 2169 additions and 1085 deletions
+8 -4
View File
@@ -22,8 +22,10 @@
openclose = M.density
spawn(0)
if(M)
if(openclose) M.open()
else M.close()
if(openclose)
M.open()
else
M.close()
return
sleep(10)
cooldown = 0
@@ -49,8 +51,10 @@
if(specialfunctions & OPEN)
spawn(0)
if(D)
if(D.density) D.open()
else D.close()
if(D.density)
D.open()
else
D.close()
return
if(specialfunctions & IDSCAN)
D.aiDisabledIdScanner = !D.aiDisabledIdScanner
+4 -2
View File
@@ -14,7 +14,8 @@
/obj/item/device/assembly/health/activate()
if(!..()) return 0//Cooldown check
if(!..())
return 0//Cooldown check
toggle_scan()
return 0
@@ -62,7 +63,8 @@
return
/obj/item/device/assembly/health/proc/toggle_scan()
if(!secured) return 0
if(!secured)
return 0
scanning = !scanning
if(scanning)
SSobj.processing |= src
+4 -2
View File
@@ -110,8 +110,10 @@
return
if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code
switch(alert("Which side would you like to use?",,"Left","Right"))
if("Left") a_left.attack_self(user)
if("Right") a_right.attack_self(user)
if("Left")
a_left.attack_self(user)
if("Right")
a_right.attack_self(user)
return
else
a_left.attack_self(user)
+4 -2
View File
@@ -19,9 +19,11 @@
/obj/item/device/assembly/igniter/activate()
if(!..()) return 0//Cooldown check
if(!..())
return 0//Cooldown check
var/turf/location = get_turf(loc)
if(location) location.hotspot_expose(1000,1000)
if(location)
location.hotspot_expose(1000,1000)
sparks.start()
return 1
+4 -2
View File
@@ -24,7 +24,8 @@
return "The infrared trigger is [on?"on":"off"]."
/obj/item/device/assembly/infra/activate()
if(!..()) return 0//Cooldown check
if(!..())
return 0//Cooldown check
on = !on
update_icon()
return 1
@@ -89,7 +90,8 @@
return
/obj/item/device/assembly/infra/holder_movement()
if(!holder) return 0
if(!holder)
return 0
// dir = holder.dir
qdel(first)
return 1
+8 -4
View File
@@ -26,7 +26,8 @@
return "The proximity sensor is [scanning?"armed":"disarmed"]."
/obj/item/device/assembly/prox_sensor/activate()
if(!..()) return 0//Cooldown check
if(!..())
return 0//Cooldown check
timing = !timing
update_icon()
return 1
@@ -45,12 +46,14 @@
/obj/item/device/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
if (istype(AM, /obj/effect/beam)) return
if (istype(AM, /obj/effect/beam))
return
sense()
/obj/item/device/assembly/prox_sensor/sense()
if((!secured)||(!scanning)||(cooldown > 0)) return 0
if((!secured)||(!scanning)||(cooldown > 0))
return 0
pulse(0)
audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
@@ -73,7 +76,8 @@
/obj/item/device/assembly/prox_sensor/toggle_scan()
if(!secured) return 0
if(!secured)
return 0
scanning = !scanning
update_icon()
+14 -7
View File
@@ -25,7 +25,8 @@
return ..()
/obj/item/device/assembly/signaler/activate()
if(cooldown > 0) return 0
if(cooldown > 0)
return 0
cooldown = 2
spawn(10)
process_cooldown()
@@ -118,17 +119,23 @@ Code:
return
/*
for(var/obj/item/device/assembly/signaler/S in world)
if(!S) continue
if(S == src) continue
if(!S)
continue
if(S == src)
continue
if((S.frequency == src.frequency) && (S.code == src.code))
spawn(0)
if(S) S.pulse(0)
if(S)
S.pulse(0)
return 0*/
/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal)
if(!signal) return 0
if(signal.encryption != code) return 0
if(!(src.wires & WIRE_RADIO_RECEIVE)) return 0
if(!signal)
return 0
if(signal.encryption != code)
return 0
if(!(src.wires & WIRE_RADIO_RECEIVE))
return 0
pulse(1)
audible_message("\icon[src] *beep* *beep*", null, 1)
return
+2 -1
View File
@@ -21,7 +21,8 @@
/obj/item/device/assembly/timer/activate()
if(!..()) return 0//Cooldown check
if(!..())
return 0//Cooldown check
timing = !timing
update_icon()
return 1