cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gun update 2018: mk II (#5010)

Browse Source 
-removes the shotgun magazines, moving their sprites to the boxes instead
-shotguns boxes should now all have eight shotgun shells, up from seven
-added incendiary and emp shotgun shells boxes
-added the baindolier, a belt that can hold up to 16 shotgun slugs
-fixed a bug with unloading the pocket rifle
-added empty sprites for the uzi and a different loaded gyro pistol icon
-updates some gun related merchant lists a bit
-adds the weapon suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11486
This commit is contained in:
Alberyk
2018-08-02 01:01:26 +02:00
committed by Werner
parent 57034371ef
commit 047c3a4c83
15 changed files with 112 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/weaponry.dm
+8 -1
View File
@@ -26,15 +26,21 @@
/obj/item/weapon/gun/projectile/tanto = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/detective = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/deckard = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/leyon = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/automatic/x9 = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c45m = TRADER_ALL,
/obj/item/ammo_magazine/c45m/empty = TRADER_BLACKLIST,
/obj/item/ammo_magazine/shotgun = TRADER_ALL,
/obj/item/ammo_magazine/t40 = TRADER_ALL,
/obj/item/ammo_magazine/t40/empty = TRADER_BLACKLIST,
/obj/item/ammo_magazine/c38 = TRADER_ALL,
/obj/item/ammo_magazine/leyon = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c45x = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/beanbags = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunammo = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/shotgunshells = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/haywireshells = TRADER_THIS_TYPE,
/obj/item/weapon/storage/box/incendiaryshells = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL
)
@@ -145,5 +151,6 @@
/obj/item/clothing/under/tactical = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/tactical = TRADER_THIS_TYPE,
/obj/item/weapon/shield/riot/tact = TRADER_THIS_TYPE,
/obj/item/weapon/storage/belt/security/tactical = TRADER_THIS_TYPE
/obj/item/weapon/storage/belt/security/tactical = TRADER_THIS_TYPE,
/obj/item/weapon/storage/belt/bandolier = TRADER_THIS_TYPE
)