cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

Browse Source 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
This commit is contained in:
LetterJay
2018-01-02 05:16:13 -06:00
parent 30d4b25aee b49009d481
commit f2f6d9d910
74 changed files with 370 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/events/alien_infestation.dm
View File

@@ -2,9 +2,8 @@
name = "Alien Infestation"
typepath = /datum/round_event/ghost_role/alien_infestation
weight = 5
earliest_start = 24000 //40 min
min_players = 20 //Avoid lowpop rounds
min_players = 10
max_occurrences = 1
/datum/round_event/ghost_role/alien_infestation
@@ -16,6 +15,7 @@
// 50% chance of being incremented by one
var/spawncount = 1
var/successSpawn = 0 //So we don't make a command report if nothing gets spawned.
fakeable = TRUE
/datum/round_event/ghost_role/alien_infestation/setup()
@@ -74,3 +74,4 @@
else
// Like how did we get here?
return FALSE