Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

This commit is contained in:
Putnam
2020-05-11 17:10:55 -07:00
113 changed files with 2285 additions and 1785 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
role_name = "random animal"
var/animals = 1
var/one = "one"
/// Blacklisted mob_biotypes - Hey can we like, not have player controlled megafauna?
/// Blacklisted mob_biotypes - Hey can we like, not have player controlled megafauna?
var/blacklisted_biotypes = MOB_EPIC
fakeable = TRUE
@@ -54,7 +54,7 @@
SG.transfer_ckey(SA, FALSE)
SA.grant_all_languages(TRUE)
SA.grant_all_languages(TRUE, FALSE, FALSE)
SA.sentience_act()