Some fixes

Conflicts:
	code/game/supplyshuttle.dm
This commit is contained in:
mwerezak
2014-06-23 11:09:14 -04:00
committed by ZomgPonies
parent 59f1cc3b0a
commit d8c02c7b6e
4 changed files with 76 additions and 79 deletions
+1 -1
View File
@@ -927,7 +927,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin"
set name = "Call Shuttle"
if ((!( ticker ) || emergency_shuttle.location()))
if ((!( ticker ) || !emergency_shuttle.location()))
return
if(!check_rights(R_ADMIN)) return