Merge branch 'master' into upstream-merge-10055

This commit is contained in:
Nadyr
2021-04-03 00:25:44 -04:00
committed by GitHub
37 changed files with 176354 additions and 125 deletions
@@ -28,8 +28,8 @@
req_one_access = list(access_explorer,access_brig)
starts_with = list(
/obj/item/weapon/gun/energy/phasegun = 2,
/obj/item/weapon/gun/energy/phasegun/pistol,
/obj/item/weapon/gun/energy/locked/phasegun = 2,
/obj/item/weapon/gun/energy/locked/phasegun/pistol,
/obj/item/weapon/cell/device/weapon = 2,
/obj/item/clothing/accessory/permit/gun/planetside)