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
@@ -243,8 +243,6 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters
else
return GetSpecies(card_defense_type," mixed with ")
return "unknown"
/datum/controller/subsystem/battle_monsters/proc/GetSpecies(card_defense_type, var/and_text = " and ")
//This list looks odd to prevent runtime errors related to out of bounds indexes
@@ -520,4 +518,4 @@ var/datum/controller/subsystem/battle_monsters/SSbattlemonsters
#undef BATTLE_MONSTERS_GEN_ROOT
#undef BATTLE_MONSTERS_GEN_SUFFIX
#undef BATTLE_MONSTERS_GEN_TRAP
#undef BATTLE_MONSTERS_GEN_SPELL
#undef BATTLE_MONSTERS_GEN_SPELL
+1 -1
View File
@@ -138,7 +138,7 @@ var/datum/controller/subsystem/chemistry/SSchemistry
cc.result = chemconfig[chemical]["result"]
cc.result_amount = chemconfig[chemical]["resultamount"]
cc.required_reagents = chemconfig[chemical]["required_reagents"]
if(!cc.result in chemical_reagents)
if(!(cc.result in chemical_reagents))
log_debug("SSchemistry: Warning: Invalid result [cc.result] in [cc.name] reactions list.")
qdel(cc)
+1 -1
View File
@@ -56,7 +56,7 @@
var/datum/job/job = new J()
if(!job || job.faction != faction)
continue
if(!job.faction in faction)
if(!(job.faction in faction))
continue
occupations += job
name_occupations[job.title] = job
+3 -3
View File
@@ -40,7 +40,7 @@
if(href_list["download"])
var/datum/paiCandidate/candidate = locate(href_list["candidate"])
var/obj/item/device/paicard/card = locate(href_list["device"])
if (!candidate in pai_candidates)
if (!(candidate in pai_candidates))
return
if(card.pai)
@@ -105,7 +105,7 @@
return FALSE
candidate.ready = FALSE
return TRUE
/datum/controller/subsystem/pai/proc/recruitWindow(mob/M as mob)
var/datum/paiCandidate/candidate
@@ -144,7 +144,7 @@
nstate = interactive_state)
ui.metadata = list("candidate" = candidate)
ui.header = "minimal"
return ui.open()
/datum/controller/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user)
+5 -5
View File
@@ -160,7 +160,7 @@ var/datum/controller/subsystem/timer/SStimer
if (timer.timeToRun < head_offset)
bucket_resolution = null //force bucket recreation
CRASH("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
crash_with("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
if (timer.callBack && !timer.spent)
timer.callBack.InvokeAsync()
@@ -172,7 +172,7 @@ var/datum/controller/subsystem/timer/SStimer
if (timer.timeToRun < head_offset + TICKS2DS(practical_offset-1))
bucket_resolution = null //force bucket recreation
CRASH("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
crash_with("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
if (timer.callBack && !timer.spent)
timer.callBack.InvokeAsync()
spent += timer
@@ -335,7 +335,7 @@ var/datum/controller/subsystem/timer/SStimer
timeToRun = REALTIMEOFDAY + wait
else
timeToRun = world.time + wait
if (flags & TIMER_UNIQUE)
SStimer.hashes[hash] = src
if (flags & TIMER_STOPPABLE)
@@ -525,7 +525,7 @@ var/datum/controller/subsystem/timer/SStimer
var/datum/timedevent/timer = null
if (!istext(id) && istype(id, /datum/timedevent))
timer = id
else
else
timer = SStimer.timer_id_dict[id]
if(!timer)
@@ -543,4 +543,4 @@ var/datum/controller/subsystem/timer/SStimer
#undef BUCKET_LEN
#undef BUCKET_POS
#undef TIMER_ID_MAX
#undef TIMER_MAX
#undef TIMER_MAX
+1 -1
View File
@@ -257,8 +257,8 @@ var/datum/controller/subsystem/vote/SSvote
to_chat(initiator_key, "The current alert status is too high to call for a crew transfer!")
return 0
if(SSticker.current_state <= 2)
return 0
to_chat(initiator_key, "The crew transfer button has been disabled!")
return 0
question = "End the shift?"
AddChoice("Initiate Crew Transfer")
AddChoice("Continue The Round")