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

Merge remote-tracking branch 'upstream/master' into cache2

Browse Source
This commit is contained in:
Archie
2021-06-27 04:32:49 -03:00
parent 6291626ab4 c60866c101
commit 8173a1756e
7 changed files with 77 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+4 -4
View File
@@ -188,10 +188,10 @@
weight = 3
cost = 10
requirements = list(101,101,50,40,40,30,30,30,20,20)
minimum_players = 15
minimum_players = 30
high_population_requirement = 10
var/team_mode_probability = 30
chaos_min = 3.0
var/team_mode_probability = 0
chaos_min = 3.5
/datum/dynamic_ruleset/roundstart/changeling/pre_execute()
var/num_changelings = min(round(mode.candidates.len / 10) + 1, candidates.len)
@@ -849,7 +849,7 @@
cost = 0
requirements = list(101,101,101,70,60,60,50,50,50,40)
high_population_requirement = 10
chaos_min = 4.0
chaos_min = 3.2
/datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute()
code/game/mecha/mecha_construction_paths.dm
+1 -1
View File
@@ -256,7 +256,7 @@
user.visible_message("[user] unfastens the scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
if(12)
if(diff==FORWARD)
user.visible_message("[user] secures [I].", "<span class='notice'>You secure [I].</span>")
user.visible_message("[user] secures the capacitor.", "<span class='notice'>You secure the capacitor.</span>")
else
user.visible_message("[user] removes the capacitor from [parent].", "<span class='notice'>You remove the capacitor from [parent].</span>")
if(13)