cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bad Moon on the Rise: A Farewell to Arms edition (#9715)

Browse Source
This commit is contained in:
Alberyk
2020-08-22 11:22:56 +02:00
committed by GitHub
parent 2da2e50644
commit 59a3ed600b
28 changed files with 249 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/misc.dm
+4 -1
View File
@@ -161,7 +161,10 @@
/obj/item/material/twohanded/pike = TRADER_ALL,
/obj/item/material/twohanded/zweihander = TRADER_THIS_TYPE,
/obj/item/melee/whip = TRADER_THIS_TYPE,
/obj/item/grenade/dynamite = TRADER_THIS_TYPE
/obj/item/grenade/dynamite = TRADER_THIS_TYPE,
/obj/item/gun/projectile/musket = TRADER_THIS_TYPE,
/obj/item/reagent_containers/powder_horn = TRADER_THIS_TYPE,
/obj/item/ammo_casing/musket = TRADER_THIS_TYPE
)
code/datums/trading/weaponry.dm
+3 -1
View File
@@ -117,7 +117,9 @@
/obj/item/gun/projectile/deagle/adhomai = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/adhomian = TRADER_THIS_TYPE,
/obj/item/gun/launcher/harpoon = TRADER_THIS_TYPE,
/obj/item/gun/projectile/shotgun/foldable = TRADER_THIS_TYPE
/obj/item/gun/projectile/shotgun/foldable = TRADER_THIS_TYPE,
/obj/item/gun/projectile/automatic/rifle/adhomian = TRADER_THIS_TYPE,
/obj/item/gun/projectile/revolver/knife = TRADER_THIS_TYPE
)