Bump dreamchecker version to 1.4 (#8711)

This commit is contained in:
Matt Atlas
2020-04-28 15:41:32 +02:00
committed by GitHub
parent a0938b98c7
commit 4b97822bb4
88 changed files with 153 additions and 293 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
return FALSE
if(config.protect_roles_from_antagonist && (player.assigned_role in protected_jobs))
return FALSE
if(player.current.client.prefs && player.current.client.prefs.species in restricted_species)
if(player.current.client.prefs && (player.current.client.prefs.species in restricted_species))
return FALSE
if(player.current && (player.current.status_flags & NO_ANTAG))
return FALSE
+1 -1
View File
@@ -27,7 +27,7 @@
* Is the gene active in this mob's DNA?
*/
/datum/dna/gene/proc/is_active(var/mob/M)
return M.active_genes && type in M.active_genes
return M.active_genes && (type in M.active_genes)
// Return 1 if we can activate.
// HANDLE MUTCHK_FORCED HERE!
@@ -13,5 +13,4 @@
to_chat(user, span("warning", "The world beyond opens to your eyes."))
user.see_invisible = SEE_INVISIBLE_CULT
user.seer = TRUE
return
return fizzle(user)
return fizzle(user)
+1 -1
View File
@@ -16,7 +16,7 @@
if(iscarbon(L))
var/mob/living/carbon/C = L
flick("e_flash", C.flash)
if(C.stuttering < 1 && !HULK in C.mutations)
if(C.stuttering < 1 && !(HULK in C.mutations))
C.stuttering = 1
if(is_rune)
C.Weaken(3)
+2 -2
View File
@@ -351,14 +351,14 @@ var/global/list/additional_antag_types = list()
var/mob/living/carbon/human/H = M
if(M.stat != DEAD)
surviving_humans++
if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations)
if(M.loc && M.loc.loc && (M.loc.loc.type in escape_locations))
escaped_humans++
if (isipc(H))
var/datum/species/machine/machine = H.species
machine.update_tag(H, H.client)
if(M.stat != DEAD)
surviving_total++
if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations)
if(M.loc && M.loc.loc && (M.loc.loc.type in escape_locations))
escaped_total++
if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape/centcom)
@@ -130,8 +130,8 @@
return
if (reporttype == "Template")
sanitizeSafe(alert(usr, "Would you like it to appear as if CCIAMS made the report?",,"Yes","No"))
if ("Yes")
var/resp = alert(usr, "Would you like it to appear as if CCIAMS made the report?",,"Yes","No")
if (resp == "Yes")
reportbody += "\n\n- CCIAMS, [commstation_name()]"
else
-4
View File
@@ -351,16 +351,12 @@
for(var/obj/machinery/camera/C in oview(4, M))
if(C.can_use()) // check if camera disabled
return C
break
return null
/proc/near_range_camera(var/mob/M)
for(var/obj/machinery/camera/C in range(4, M))
if(C.can_use()) // check if camera disabled
return C
break
return null
/obj/machinery/camera/proc/weld(var/obj/item/weldingtool/WT, var/mob/user)
@@ -23,7 +23,6 @@ var/syndicate_elite_shuttle_timeleft = 0
/proc/syndicate_elite_process()
var/area/syndicate_mothership/control/syndicate_ship = locate()//To find announcer. This area should exist for this proc to work.
var/area/syndicate_mothership/elite_squad/elite_squad = locate()//Where is the specops area located?
var/mob/living/silicon/decoy/announcer = locate() in syndicate_ship//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
@@ -63,86 +62,6 @@ var/syndicate_elite_shuttle_timeleft = 0
to_chat(usr, "<span class='warning'>The Syndicate Elite shuttle is unable to leave.</span>")
return
sleep(600)
/*
//Begin Marauder launchpad.
spawn(0)//So it parallel processes it.
for(var/obj/machinery/door/poddoor/M in elite_squad)
switch(M.id)
if("ASSAULT0")
spawn(10)//1 second delay between each.
M.open()
if("ASSAULT1")
spawn(20)
M.open()
if("ASSAULT2")
spawn(30)
M.open()
if("ASSAULT3")
spawn(40)
M.open()
sleep(10)
var/spawn_marauder[] = new()
for(var/obj/effect/landmark/L in landmarks_list)
if(L.name == "Marauder Entry")
spawn_marauder.Add(L)
for(var/obj/effect/landmark/L in landmarks_list)
if(L.name == "Marauder Exit")
var/obj/effect/portal/P = new(L.loc)
P.invisibility = 101//So it is not seen by anyone.
P.failchance = 0//So it has no fail chance when teleporting.
P.target = pick(spawn_marauder)//Where the marauder will arrive.
spawn_marauder.Remove(P.target)
sleep(10)
for(var/obj/machinery/mass_driver/M in elite_squad)
switch(M.id)
if("ASSAULT0")
spawn(10)
M.drive()
if("ASSAULT1")
spawn(20)
M.drive()
if("ASSAULT2")
spawn(30)
M.drive()
if("ASSAULT3")
spawn(40)
M.drive()
sleep(50)//Doors remain open for 5 seconds.
for(var/obj/machinery/door/poddoor/M in elite_squad)
switch(M.id)//Doors close at the same time.
if("ASSAULT0")
spawn(0)
M.close()
if("ASSAULT1")
spawn(0)
M.close()
if("ASSAULT2")
spawn(0)
M.close()
if("ASSAULT3")
spawn(0)
M.close()
*/
elite_squad.readyreset()//Reset firealarm after the team launched.
//End Marauder launchpad.
/*
var/obj/explosionmarker = locate("Syndicate Breach Area")
if(explosionmarker)
var/turf/simulated/T = explosionmarker.loc
if(T)
explosion(T,4,6,8,10,0)
sleep(40)
// proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
*/
var/area/start_location = locate(/area/shuttle/syndicate_elite/mothership)
var/area/end_location = locate(/area/shuttle/syndicate_elite/station)
-1
View File
@@ -123,7 +123,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
src.isbroken=1
src.update_icon()
return
return
/obj/machinery/newscaster/attack_ai(mob/user as mob)
return src.attack_hand(user)
+3 -3
View File
@@ -454,17 +454,17 @@ Buildable meters
else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT, PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT, PIPE_SUPPLY_BENT, PIPE_SUPPLY_STRAIGHT))
if(pipe_type in list(PIPE_SIMPLE_BENT, PIPE_SIMPLE_STRAIGHT))
if(PIPE_SIMPLE_BENT)
if(pipe_type == PIPE_SIMPLE_BENT)
pipe_type = PIPE_SCRUBBERS_BENT
else
pipe_type =PIPE_SCRUBBERS_STRAIGHT
else if(pipe_type in list(PIPE_SCRUBBERS_BENT, PIPE_SCRUBBERS_STRAIGHT))
if(PIPE_SCRUBBERS_BENT)
if(pipe_type == PIPE_SCRUBBERS_BENT)
pipe_type = PIPE_SUPPLY_BENT
else
pipe_type = PIPE_SUPPLY_STRAIGHT
else if(pipe_type in list(PIPE_SUPPLY_BENT, PIPE_SUPPLY_STRAIGHT))
if(PIPE_SUPPLY_BENT)
if(pipe_type == PIPE_SUPPLY_BENT)
pipe_type = PIPE_SIMPLE_BENT
else
pipe_type = PIPE_SIMPLE_STRAIGHT
+3 -1
View File
@@ -82,10 +82,12 @@
user.visible_message(span("notice", "[user] [panel_open ? "opens" : "closes"] the hatch on the [src]."),
span("notice", "You [panel_open ? "open" : "close"] the hatch on the [src]."))
update_icon()
return
if(!panel_open && user.machine == src)
user << browse(null, "window=spaceheater")
user.unset_machine()
return
else
..()
return
-1
View File
@@ -211,7 +211,6 @@
return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
else
return "Launch"
return ""
/obj/machinery/status_display/proc/remove_display()
cut_overlays()
-2
View File
@@ -101,8 +101,6 @@
return
else
return
return
/obj/machinery/suit_storage_unit/attack_hand(mob/user as mob)
var/dat
@@ -56,7 +56,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
continue
if(amount && send_count >= amount)
break
if(!machine.loc.z in listening_level)
if(!(machine.loc.z in listening_level))
if(long_range_link == 0 && machine.long_range_link == 0)
continue
// If we're sending a copy, be sure to create the copy for EACH machine and paste the data
@@ -52,7 +52,7 @@
for(var/mob/M in viewingcode)
if( (M.machine == src && M in view(1, src) ) || issilicon(M))
if((M.machine == src && (M in view(1, src))) || issilicon(M))
winset(M, "tcscode", "is-disabled=true")
winset(M, "tcscode", "text=\"[showcode]\"")
else
+3 -3
View File
@@ -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)
+1 -1
View File
@@ -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
-1
View File
@@ -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)
+1 -11
View File
@@ -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()