Merge branch 'master' into gatofication2

2024-11-21 22:11:24 +01:00
parent 4518a0b016 2dd9f92643
commit 9d9f805d7b
193 changed files with 4649 additions and 708 deletions
@@ -474,11 +474,11 @@
 	uniform = /obj/item/clothing/under/pants/youngfolksjeans
 	id = /obj/item/card/id

-/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
-	..()
-	if(visualsOnly)
-		return
-	H.dna.add_mutation(STONER)
+// /datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+// 	..()
+// 	if(visualsOnly)
+// 		return
+// 	H.dna.add_mutation(STONER) //GS13 - removes the stoner trait, it makes the role almost unplayable

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