cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds pranks, jukes, and anal retentive bolt action rifles (#3664)

Browse Source
This commit is contained in:
WrongEnd
2017-11-10 23:53:01 -06:00
committed by Lohikar
parent 629da0f9c5
commit 73a10d20e2
15 changed files with 300 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/trading/misc.dm
+2 -1
View File
@@ -119,7 +119,8 @@
/obj/item/weapon/gun/launcher/pneumatic/small = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/monkeymask = TRADER_THIS_TYPE,
/obj/item/clothing/suit/monkeysuit = TRADER_THIS_TYPE,
/obj/item/clothing/mask/luchador = TRADER_ALL
/obj/item/clothing/mask/luchador = TRADER_ALL,
/obj/item/weapon/gun/bang = TRADER_SUBTYPES_ONLY
)
/datum/trader/ship/replica_shop
code/datums/trading/weaponry.dm
+2 -1
View File
@@ -99,7 +99,8 @@
/obj/item/weapon/gun/projectile/revolver/derringer = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/pirate = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/contender = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/revolver/lemat = TRADER_THIS_TYPE
/obj/item/weapon/gun/projectile/revolver/lemat = TRADER_THIS_TYPE,
/obj/item/weapon/gun/projectile/boltaction/vintage = TRADER_THIS_TYPE
)