mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-17 10:57:19 +01:00
Bump dreamchecker version to 1.4 (#8711)
This commit is contained in:
@@ -133,7 +133,7 @@
|
||||
set name = "Move To Top"
|
||||
set category = "Object"
|
||||
|
||||
if (!I in view(1, src))
|
||||
if (!(I in view(1, src)))
|
||||
return
|
||||
if(!istype(I.loc, /turf) || usr.stat || usr.restrained() )
|
||||
return
|
||||
@@ -469,7 +469,7 @@ var/list/global/slot_flags_enumeration = list(
|
||||
|
||||
if(!(usr)) //BS12 EDIT
|
||||
return
|
||||
if (!I in view(1, src))
|
||||
if (!(I in view(1, src)))
|
||||
return
|
||||
if (istype(I, /obj/item/storage/internal))
|
||||
return
|
||||
@@ -672,7 +672,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
|
||||
if(M.stat || !(ishuman(M)))
|
||||
to_chat(M, SPAN_WARNING("You are unable to focus through \the [devicename]!"))
|
||||
cannotzoom = 1
|
||||
else if(!zoom && global_hud.darkMask[1] in M.client.screen)
|
||||
else if(!zoom && (global_hud.darkMask[1] in M.client.screen))
|
||||
to_chat(M, SPAN_WARNING("Your visor gets in the way of looking through the [devicename]!"))
|
||||
cannotzoom = 1
|
||||
else if(!zoom && M.get_active_hand() != src)
|
||||
|
||||
@@ -433,7 +433,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
var/auto_update = 1
|
||||
if(mode in no_auto_update)
|
||||
auto_update = 0
|
||||
if(old_ui && (mode == lastmode && ui_tick % 5 && mode in update_every_five))
|
||||
if(old_ui && (mode == lastmode && ui_tick % 5 && (mode in update_every_five)))
|
||||
return
|
||||
|
||||
lastmode = mode
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
set src in usr
|
||||
|
||||
var/num = input(usr, "Please enter the low-bound for the detector") as num|null
|
||||
if (null)
|
||||
if (num == null)
|
||||
return
|
||||
|
||||
low = num
|
||||
@@ -49,7 +49,7 @@
|
||||
set src in usr
|
||||
|
||||
var/num = input(usr, "Please enter the high-bound for the detector") as num|null
|
||||
if (null)
|
||||
if (num == null)
|
||||
return
|
||||
|
||||
high = num
|
||||
|
||||
@@ -425,7 +425,7 @@ var/global/list/default_medbay_channels = list(
|
||||
R.receive_signal(signal)
|
||||
|
||||
// Receiving code can be located in Telecommunications.dm
|
||||
return signal.data["done"] && position.z in signal.data["level"]
|
||||
return signal.data["done"] && (position.z in signal.data["level"])
|
||||
|
||||
|
||||
/* ###### Intercoms and station-bounced radios ###### */
|
||||
@@ -476,7 +476,7 @@ var/global/list/default_medbay_channels = list(
|
||||
|
||||
sleep(rand(10,25)) // wait a little...
|
||||
|
||||
if(signal.data["done"] && position.z in signal.data["level"])
|
||||
if(signal.data["done"] && (position.z in signal.data["level"]))
|
||||
// we're done here.
|
||||
return 1
|
||||
|
||||
|
||||
@@ -220,7 +220,6 @@
|
||||
if(!S.use_charge(charge_costs[i] * used)) // Doesn't need to be deleted
|
||||
return 0
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/stack/proc/add(var/extra)
|
||||
if(!uses_charge)
|
||||
|
||||
@@ -44,17 +44,7 @@
|
||||
var/datum/autopsy_data/W = O.autopsy_data[V]
|
||||
|
||||
if(!W.pretend_weapon)
|
||||
/*
|
||||
// the more hits, the more likely it is that we get the right weapon type
|
||||
if(prob(50 + W.hits * 10 + W.damage))
|
||||
*/
|
||||
|
||||
// Buffing this stuff up for now!
|
||||
if(1)
|
||||
W.pretend_weapon = W.weapon
|
||||
else
|
||||
W.pretend_weapon = pick("mechanical toolbox", "wirecutters", "revolver", "crowbar", "fire extinguisher", "tomato soup", "oxygen tank", "emergency oxygen tank", "laser", "bullet")
|
||||
|
||||
W.pretend_weapon = W.weapon
|
||||
|
||||
var/datum/autopsy_data_scanner/D = wdata[V]
|
||||
if(!D)
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
overlays.Cut()
|
||||
if(front_id)
|
||||
var/tiny_state = "id-generic"
|
||||
if("id-"+front_id.icon_state in icon_states(icon))
|
||||
if(("id-" + front_id.icon_state) in icon_states(icon))
|
||||
tiny_state = "id-"+front_id.icon_state
|
||||
var/image/tiny_image = new/image(icon, icon_state = tiny_state)
|
||||
tiny_image.appearance_flags = RESET_COLOR
|
||||
@@ -201,4 +201,4 @@
|
||||
var/image/film_image = new/image(icon, icon_state = "lanyard_film")
|
||||
film_image.appearance_flags = RESET_COLOR
|
||||
overlays += film_image
|
||||
mob_icon_update()
|
||||
mob_icon_update()
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
else if(src in location) // or if tank is in the mobs possession
|
||||
if(!location.internal) // and they do not have any active internals
|
||||
mask_check = 1
|
||||
else if(istype(src.loc, /obj/item/rig) && src.loc in location) // or the rig is in the mobs possession
|
||||
else if(istype(src.loc, /obj/item/rig) && (src.loc in location)) // or the rig is in the mobs possession
|
||||
if(!location.internal) // and they do not have any active internals
|
||||
mask_check = 1
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ obj/structure/ex_act(severity)
|
||||
if(pod.contents.len)
|
||||
to_chat(AM, "<span class='notice'>The pod is already occupied.</span>")
|
||||
return
|
||||
else if(!pod.moving && pod.dir in directions())
|
||||
else if(!pod.moving && (pod.dir in directions()))
|
||||
AM.forceMove(pod)
|
||||
return
|
||||
|
||||
@@ -127,7 +127,7 @@ obj/structure/ex_act(severity)
|
||||
/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
|
||||
if(!pod_moving)
|
||||
for(var/obj/structure/transit_tube_pod/pod in loc)
|
||||
if(!pod.moving && pod.dir in directions())
|
||||
if(!pod.moving && (pod.dir in directions()))
|
||||
if(icon_state == "closed")
|
||||
open_animation()
|
||||
|
||||
@@ -156,7 +156,7 @@ obj/structure/ex_act(severity)
|
||||
|
||||
/obj/structure/transit_tube/station/proc/launch_pod()
|
||||
for(var/obj/structure/transit_tube_pod/pod in loc)
|
||||
if(!pod.moving && pod.dir in directions())
|
||||
if(!pod.moving && (pod.dir in directions()))
|
||||
spawn(5)
|
||||
pod_moving = 1
|
||||
close_animation()
|
||||
|
||||
Reference in New Issue
Block a user