cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vox trader changes

Browse Source
This commit is contained in:
Markolie
2015-01-06 23:36:26 +01:00
parent 2e37a88639
commit 3f8c04686d
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+13
View File
@@ -351,6 +351,19 @@ proc/isInSight(var/atom/A, var/atom/B)
candidates += G.key
i++
return candidates
/proc/get_vox_candidates()
var/list/candidates = list() //List of candidate KEYS to assume control of the new blob core ~Carn
var/i = 0
while(candidates.len <= 0 && i < 5)
for(var/mob/G in respawnable_list)
if( G.client && G.client.prefs.be_special & BE_VOX)
if(((G.client.inactivity/10)/60) <= ALIEN_SELECT_AFK_BUFFER + i) // the most active players are more likely to become an alien
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
candidates += G.key
i++
return candidates
/proc/get_slime_candidates()
code/game/gamemodes/vox/trade/trade.dm
+3 -3
View File
@@ -9,9 +9,9 @@ VOX TRADE ROUNDTYPE
/datum/game_mode/vox/trade
name = "trade"
config_tag = "trade"
required_players = 10
required_players_secret = 10
required_enemies = 1
required_players = 15
required_players_secret = 15
required_enemies = 3
recommended_enemies = 3
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
code/game/gamemodes/vox/vox.dm
+2 -2
View File
@@ -94,7 +94,7 @@ datum/objective/vox/heist/loot
if(2)
target = /obj/machinery/the_singularitygen
target_amount = 1
loot = "a gravitational generator"
loot = "a gravitational singularity generator"
if(3)
target = /obj/machinery/power/emitter
target_amount = 4
@@ -216,7 +216,7 @@ datum/objective/vox/trade/trade
if(2)
target = /obj/machinery/the_singularitygen
target_amount = 1
loot = "a gravitational generator"
loot = "a gravitational singularity generator"
if(3)
target = /obj/machinery/power/emitter
target_amount = 4
code/modules/client/preferences.dm
+2 -2
View File
@@ -15,11 +15,11 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"cultist" = IS_MODE_COMPILED("cult"), // 8
"plant" = 1, // 9
"ninja" = "true", // 10
"vox raider" = IS_MODE_COMPILED("heist"), // 11
"vox" = IS_MODE_COMPILED("vox/heist") + IS_MODE_COMPILED("vox/trade"), // 11
"slime" = 1, // 12
"vampire" = IS_MODE_COMPILED("vampire"), // 13
"mutineer" = IS_MODE_COMPILED("mutiny"), // 14
"blob" = IS_MODE_COMPILED("blob") // 15
"blob" = IS_MODE_COMPILED("blob") // 15
)
var/const/MAX_SAVE_SLOTS = 10