cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 00:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
GinjaNinja32
2015-08-22 15:28:49 +01:00
parent a7f452416e 70241d576f
commit 4e56b82ec0
7 changed files with 680 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/viral_infection.dm
View File

@@ -35,7 +35,7 @@ datum/event/viral_infection/start()
var/list/candidates = list() //list of candidate keys
for(var/mob/living/carbon/human/G in player_list)
if(G.stat != DEAD && G.is_client_active(5))
if(G.mind && G.stat != DEAD && G.is_client_active(5) && !player_is_antag(G.mind))
var/turf/T = get_turf(G)
if(T.z in config.station_levels)
candidates += G

2
code/modules/mob/new_player/new_player.dm
View File

@@ -420,7 +420,7 @@
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
use_species_name = all_species[chosen_species.get_station_variant()] //Only used by pariahs atm.
use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm.
if(chosen_species && use_species_name)
// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.