Merge branch 'master' into bridge_gaming

This commit is contained in:
Alberyk
2021-08-24 22:49:24 -03:00
189 changed files with 4347 additions and 663 deletions
@@ -123,6 +123,7 @@
..()
//Supply
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/ids(src)
//Appearance
if(prob(50))
new /obj/item/storage/backpack/security(src)
@@ -225,6 +226,8 @@
new /obj/item/clothing/suit/storage/security/warden(src)
new /obj/item/clothing/accessory/badge/warden(src)
new /obj/item/clothing/gloves/black_leather(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/headset_warden(src)
new /obj/item/device/radio/headset/headset_warden/alt(src)
@@ -234,6 +237,8 @@
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/gun/energy/disruptorpistol(src)
new /obj/item/handcuffs(src)
new /obj/item/device/holowarrant(src)
//Belts
new /obj/item/clothing/accessory/storage/black_vest(src)
new /obj/item/clothing/accessory/holster/waist(src)