cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-11 07:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from Jay-Sparrow/Dynamic2

Browse Source 
Dynamic fixes
This commit is contained in:
Dahlular
2020-10-13 00:18:04 -06:00
committed by GitHub
parent fd6c0507b9 a661c1d42b
commit cb4d7f6cd9
9 changed files with 189 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+3
View File
@@ -879,6 +879,9 @@
<br/>Only one roundstart ruleset will be drafted. Only traitors and minor roles will latespawn. <br/>
<br/>
<br/>
<b>Chaos level:</b> Current value : <a href='?src=[REF(src)];[HrefToken()];f_dynamic_chaos_level=1'><b>[GLOB.dynamic_chaos_level]</b></a>.
<br/>The Chaos value for the round. Only set between 0 and 5!<br/>
<br/>
<b>Forced threat level:</b> Current value : <a href='?src=[REF(src)];[HrefToken()];f_dynamic_forced_threat=1'><b>[GLOB.dynamic_forced_threat_level]</b></a>.
<br/>The value threat is set to if it is higher than -1.<br/>
<br/>
code/modules/admin/topic.dm
+19
View File
@@ -1645,6 +1645,25 @@
log_admin("[key_name(usr)] set 'forced_threat_level' to [GLOB.dynamic_forced_threat_level].")
message_admins("[key_name(usr)] set 'forced_threat_level' to [GLOB.dynamic_forced_threat_level].")
dynamic_mode_options(usr)
else if(href_list["f_dynamic_chaos_level"])
if(!check_rights(R_ADMIN))
return
if(SSticker && SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
if(GLOB.master_mode != "dynamic")
return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)
var/new_value = input(usr, "Enter the chaos level for dynamic mode.", "Chaos level") as num
if (new_value > 5 || new_value < 0)
return alert(usr, "The value must be between 0 and 5.", null, null, null, null)
GLOB.dynamic_chaos_level = new_value
log_admin("[key_name(usr)] set 'dynamic_chaos_level' to [GLOB.dynamic_chaos_level].")
message_admins("[key_name(usr)] set 'dynamic_chaos_level' to [GLOB.dynamic_chaos_level].")
dynamic_mode_options(usr)
//End Dynamic mode
else if(href_list["c_mode2"])
code/modules/events/false_alarm.dm
-1
View File
@@ -55,7 +55,6 @@
continue
if(!E.canSpawnEvent(players_amt, gamemode))
continue
var/datum/round_event/event = E.typepath
if(!initial(event.fakeable))
continue
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -453,7 +453,7 @@
if(SEC_LEVEL_DELTA)
level = "delta"
var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]<br>Alert Level: [capitalize(level)]</div>"
var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]<br>Alert Level: [capitalize(level)]<br>Chaos Level: [GLOB.dynamic_chaos_level]</div>"
if(SSshuttle.emergency)
switch(SSshuttle.emergency.mode)