Merge remote-tracking branch 'upstream/master' into cumcom

This commit is contained in:
Dahlular
2021-03-25 00:15:19 -06:00
39 changed files with 715 additions and 326 deletions
@@ -27,8 +27,8 @@
var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
var/cutting_tool = /obj/item/weldingtool
var/open_sound = 'sound/machines/click.ogg'
var/close_sound = 'sound/machines/click.ogg'
var/open_sound = 'sound/effects/locker_open.ogg'
var/close_sound = 'sound/effects/locker_close.ogg'
var/material_drop = /obj/item/stack/sheet/metal
var/material_drop_amount = 2
var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
@@ -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)