Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-09-11 19:50:53 -04:00
76 changed files with 1614 additions and 1467 deletions
@@ -8,8 +8,8 @@
/mob/living/carbon/human/interactive/away/hotel/doSetup()
..()
MYID.access += access_syndicate
RPID.access += access_syndicate
MYID.access = list(access_syndicate)
RPID.access = list(access_syndicate)
/mob/living/carbon/human/interactive/away/hotel/guard
default_job = /datum/job/officer
@@ -115,4 +115,4 @@
if(K)
K.forceMove(idloc)
else
say("Your [adjective_insult] [curse_words] card was rejected.")
say("Your [adjective_insult] [curse_words] card was rejected.")