cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merc and Heist back up to oldish numbers, heist round ends normally.

Browse Source
This commit is contained in:
Anewbe
2017-04-25 18:55:36 -05:00
parent 13e9361f3e
commit cc8b17e048
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/gamemodes/heist/heist.dm
View File

@@ -7,9 +7,9 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
/datum/game_mode/heist /datum/game_mode/heist
name = "Heist" name = "Heist"
config_tag = "heist" config_tag = "heist"
required_players = 8 required_players = 15
required_players_secret = 8 required_players_secret = 15
required_enemies = 3 required_enemies = 4
round_description = "An unidentified bluespace signature is approaching the station!" round_description = "An unidentified bluespace signature is approaching the station!"
extended_round_description = "The Company's majority control of phoron in the system has marked the \ extended_round_description = "The Company's majority control of phoron in the system has marked the \
station to be a highly valuable target for many competing organizations and individuals. Being a \ station to be a highly valuable target for many competing organizations and individuals. Being a \
@@ -17,10 +17,3 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
attempts of robbery, fraud and other malicious actions." attempts of robbery, fraud and other malicious actions."
end_on_antag_death = 0 end_on_antag_death = 0
antag_tags = list(MODE_RAIDER) antag_tags = list(MODE_RAIDER)
/datum/game_mode/heist/check_finished()
if(!..())
var/datum/shuttle/multi_shuttle/skipjack = shuttle_controller.shuttles["Skipjack"]
if (skipjack && skipjack.returned_home)
return 1
return 0

6
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -12,9 +12,9 @@ var/list/nuke_disks = list()
colony of sizable population and considerable wealth causes it to often be the target of various \ colony of sizable population and considerable wealth causes it to often be the target of various \
attempts of robbery, fraud and other malicious actions." attempts of robbery, fraud and other malicious actions."
config_tag = "mercenary" config_tag = "mercenary"
required_players = 8 required_players = 15
required_players_secret = 8 required_players_secret = 15
required_enemies = 3 required_enemies = 4
end_on_antag_death = 0 end_on_antag_death = 0
var/nuke_off_station = 0 //Used for tracking if the syndies actually haul the nuke to the station var/nuke_off_station = 0 //Used for tracking if the syndies actually haul the nuke to the station
var/syndies_didnt_escape = 0 //Used for tracking if the syndies got the shuttle off of the z-level var/syndies_didnt_escape = 0 //Used for tracking if the syndies got the shuttle off of the z-level