Merge branch 'master' into upstream-merge-27534

2017-05-30 16:45:59 -05:00
parent 5073d8e6f2 03f6eeb3b7
commit 976086e490
358 changed files with 134924 additions and 11339 deletions
@@ -319,12 +319,18 @@
 	icon_state = "sleeper"
 	flavour_text = "You are a beach bum!"

+
 /datum/outfit/beachbum
 	name = "Beach Bum"
 	glasses = /obj/item/clothing/glasses/sunglasses
 	uniform = /obj/item/clothing/under/shorts/red
 	r_pocket = /obj/item/weapon/storage/wallet/random

+/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	H.dna.add_mutation(STONER)

 /////////////////Officers+Nanotrasen Security//////////////////////