Merge pull request #1046 from lyricalpaws/master

Adds psychologist role, changes Box med a bit

code/game/objects/effects/landmarks.dm

@@ -171,6 +171,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Geneticist"
 	icon_state = "Geneticist"
 
+/obj/effect/landmark/start/psychologist
+	name = "Psychologist"
+	icon_state = "Medical Doctor"
+
 /obj/effect/landmark/start/chief_medical_officer
 	name = "Chief Medical Officer"
 	icon_state = "Chief Medical Officer"

code/game/objects/items/storage/firstaid.dm

@@ -389,3 +389,28 @@
 	/obj/item/organ_storage
 	))
 
+//Psych Pillbottles
+
+/obj/item/storage/pill_bottle/happinesspsych
+	name = "happiness pill bottle"
+	desc = "Contains pills used as a last resort means to temporarily stabilize depression and anxiety. WARNING: side effects may include slurred speech, drooling, and severe addiction."
+
+/obj/item/storage/pill_bottle/happinesspsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/happinesspsych(src)
+
+/obj/item/storage/pill_bottle/lsdpsych
+	name = "mindbreaker toxin pill bottle"
+	desc = "!FOR THERAPEUTIC USE ONLY! Contains pills used to alleviate the symptoms of Reality Dissociation Syndrome."
+
+/obj/item/storage/pill_bottle/lsdpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/lsdpsych(src)
+
+/obj/item/storage/pill_bottle/paxpsych
+	name = "pacification pill"
+	desc = "Contains pills used to temporarily pacify patients that are deemed a harm to themselves or others."
+
+/obj/item/storage/pill_bottle/paxpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/paxpsych(src)

code/game/objects/structures/crates_lockers/closets/secure/psychology.dm

@@ -0,0 +1,17 @@
+/obj/structure/closet/secure_closet/psychology
+    name = "psychology locker"
+    req_access = list(ACCESS_PSYCH)
+    icon_state = "cabinet"
+
+/obj/structure/closet/secure_closet/psychology/PopulateContents()
+    ..()
+    new /obj/item/clothing/under/lawyer/blacksuit(src)
+    new /obj/item/clothing/under/lawyer/blacksuit/skirt(src)
+    new /obj/item/clothing/shoes/laceup(src)
+    new /obj/item/storage/backpack/medic(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/clipboard(src)
+    new /obj/item/clothing/suit/straight_jacket(src)
+    new /obj/item/clothing/ears/earmuffs(src)
+    new /obj/item/clothing/mask/muzzle(src)
+    new /obj/item/clothing/glasses/sunglasses/blindfold(src)