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

makes it compile.

Browse Source
This commit is contained in:
Ghommie
2019-11-12 02:38:45 +01:00
parent 0b7437359a
commit a18bcd05d7
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_cult.dm
+1 -3
View File
@@ -167,7 +167,7 @@ Credit where due:
number_players -= 30
starter_servants += round(number_players / 10)
starter_servants = min(starter_servants, 8) //max 8 servants (that sould only happen with a ton of players)
GLOB.clockwork_vitality += 60 * starter_servants //Add some starter vitality based on
GLOB.clockwork_vitality += 50 * starter_servants //some starter Vitality to help recover from initial fuck ups
while(starter_servants)
var/datum/mind/servant = antag_pick(antag_candidates)
servants_to_serve += servant
@@ -343,8 +343,6 @@ Credit where due:
or splashed onto metal sheets to make brass. This chemical can be found in minimal quantities by grinding brass sheets.\
<li><b>Brass Flasks:</b>Intended to store Zelus Oil in, but can also be used as fragile single use throwing weapons in a pinch! \
These are crafted with a single sheet of brass and fit in the Clockwork Cuirass' suit storage.\
<hr>\
<li><b>Extra Vitality Matrix:</b> You start your quest with some spare Vitality charge to help recover from any initial foul up. \
<b>Good luck!</b>"
/obj/item/paper/servant_primer/Initialize()
code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+2 -2
View File
@@ -151,9 +151,9 @@
var/burndamage = L.getFireLoss()
if(brutedamage || burndamage)
var/efficiency = 0.75
var/vitality_cost = FLOOR((brutedamage + burndamage * efficienty) / 10, 1)
var/vitality_cost = FLOOR((brutedamage + burndamage * efficiency) / 10, 1)
if(GLOB.clockwork_vitality < vitality_cost)
efficiency = efficienty * round(GLOB.clockwork_vitality / vitality_cost, 0.1)
efficiency = efficiency * round(GLOB.clockwork_vitality / vitality_cost, 0.1)
L.adjustBruteLoss(-(brutedamage * efficiency))
L.adjustFireLoss(-(burndamage * efficiency))
GLOB.clockwork_vitality = min(GLOB.clockwork_vitality - vitality_cost, 0)