cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-10 13:00:06 +10:30
parent c481bd151d 57110b4059
commit b4ea25d064
42 changed files with 2122 additions and 2046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_mobs.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/datum/seed/proc/request_player(var/mob/living/host)
if(!host) return
for(var/mob/dead/observer/O in player_list)
if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist))
if(jobban_isbanned(O, "Dionaea") || (!is_alien_whitelisted(O, "Diona") && config.usealienwhitelist))
continue
if(O.client)
if(O.client.prefs.be_special & BE_PLANT && !(O.client in currently_querying))