cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compile errors II

Browse Source
This commit is contained in:
Jack Edge
2016-06-24 09:59:12 +01:00
parent 3f4d409736
commit 2e093a54dd
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gang/dominator.dm
+1 -1
View File
@@ -182,7 +182,7 @@
user << "<span class='warning'>Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.</span>"
return
var/time = round(get_domination_time(tempgang)/60,0.1)
var/time = round(determine_domination_time(tempgang)/60,0.1)
if(alert(user,"With [round((tempgang.territory.len/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] minutes.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready")
if((tempgang.is_dominating) || !tempgang.dom_attempts || !in_range(src, user) || !istype(src.loc, /turf))
return 0
code/game/gamemodes/gang/gang_datum.dm
+1 -1
View File
@@ -179,7 +179,7 @@
//Calculate and report influence growth
var/message = "<b>[src] Gang Status Report:</b><BR>*---------*<br>"
if(is_dominating)
var/seconds_remaining = dominating_time_remaining()
var/seconds_remaining = domination_time_remaining()
var/new_time = max(180, seconds_remaining - (uniformed * 4) - (territory.len * 2))
if(new_time < seconds_remaining)
message += "Takeover shortened by [seconds_remaining - new_time] seconds for defending [territory.len] territories and [uniformed] uniformed gangsters.<BR>"
code/game/gamemodes/gang/recaller.dm
+2 -2
View File
@@ -42,7 +42,7 @@
dat += "This device is not authorized to promote.<br>"
else
if(gang.is_dominating)
dat += "<center><font color='red'>Takeover In Progress:<br><B>[gang.dominating_time_remaining()] seconds remain</B></font></center>"
dat += "<center><font color='red'>Takeover In Progress:<br><B>[gang.domination_time_remaining()] seconds remain</B></font></center>"
var/isboss = (user.mind == gang.bosses[1])
var/points = gang.points
@@ -157,7 +157,7 @@
dat += "<a href='?src=\ref[src];purchase=dominator'><b>Station Dominator</b></a><br>"
else
dat += "<b>Station Dominator</b><br>"
dat += "<i>(Estimated Takeover Time: [round(get_domination_time(gang)/60,0.1)] minutes)</i><br>"
dat += "<i>(Estimated Takeover Time: [round(determine_domination_time(gang)/60,0.1)] minutes)</i><br>"
dat += "<br>"
dat += "<a href='?src=\ref[src];choice=refresh'>Refresh</a><br>"
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -303,7 +303,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(ticker.mode)
for(var/datum/gang/G in ticker.mode.gangs)
if(G.is_dominating)
stat(null, "[G.name] Gang Takeover: [max(G.dominating_time_remaining(), 0)]")
stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
code/modules/mob/living/living.dm
+1 -1
View File
@@ -923,7 +923,7 @@ Sorry Giacom. Please don't be mad :(
if(ticker.mode)
for(var/datum/gang/G in ticker.mode.gangs)
if(G.is_dominating)
stat(null, "[G.name] Gang Takeover: [max(G.dominating_time_remaining(), 0)]")
stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
/mob/living/cancel_camera()
..()