shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law

Browse Source 
Fix replace_random_law runtime
This commit is contained in:
oranges
2018-01-23 01:43:00 -06:00
committed by CitadelStationBot
parent 5e1ff26276
commit 58855df5dd
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai_laws.dm
+1 -1
View File
@@ -295,7 +295,7 @@
supplied[number + 1] = law supplied[number + 1] = law
/datum/ai_laws/proc/replace_random_law(law,groups) /datum/ai_laws/proc/replace_random_law(law,groups)
var/replaceable_groups = list(LAW_ZEROTH = 0,LAW_ION = 0,LAW_SUPPLIED = 0,LAW_INHERENT = 0) var/replaceable_groups = list()
if(zeroth && (LAW_ZEROTH in groups)) if(zeroth && (LAW_ZEROTH in groups))
replaceable_groups[LAW_ZEROTH] = 1 replaceable_groups[LAW_ZEROTH] = 1
if(ion.len && (LAW_ION in groups)) if(ion.len && (LAW_ION in groups))
code/modules/events/ion_storm.dm
+2 -5
View File
@@ -41,7 +41,7 @@
if(prob(removeRandomLawChance)) if(prob(removeRandomLawChance))
M.remove_law(rand(1, M.laws.get_law_amount(list(LAW_INHERENT, LAW_SUPPLIED)))) M.remove_law(rand(1, M.laws.get_law_amount(list(LAW_INHERENT, LAW_SUPPLIED))))
var/message = generate_ion_law(ionMessage) var/message = ionMessage || generate_ion_law()
if(message) if(message)
if(prob(removeDontImproveChance)) if(prob(removeDontImproveChance))
M.replace_random_law(message, list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION)) M.replace_random_law(message, list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
@@ -59,10 +59,7 @@
if(prob(botEmagChance)) if(prob(botEmagChance))
bot.emag_act() bot.emag_act()
/proc/generate_ion_law(ionMessage) /proc/generate_ion_law()
if(ionMessage)
return ionMessage
//Threats are generally bad things, silly or otherwise. Plural. //Threats are generally bad things, silly or otherwise. Plural.
var/ionthreats = pick_list(ION_FILE, "ionthreats") var/ionthreats = pick_list(ION_FILE, "ionthreats")
//Objects are anything that can be found on the station or elsewhere, plural. //Objects are anything that can be found on the station or elsewhere, plural.