shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock

Browse Source 
The warcrime gun belongs in the armory
This commit is contained in:
silicons
2020-08-11 01:44:07 -07:00
committed by GitHub
parent 46528a0e92 0f27a89e5d
commit e7d7b991d9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/cargo/packs/armory.dm
View File

@@ -223,3 +223,10 @@
/obj/item/ammo_box/magazine/wt550m9/wtrubber,
/obj/item/ammo_box/magazine/wt550m9/wtrubber)
crate_name = "auto rifle ammo crate"
/datum/supply_pack/security/armory/hell_single
name = "Hellgun Single-Pack"
crate_name = "hellgun crate"
desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
cost = 1500
contains = list(/obj/item/gun/energy/laser/hellgun)

6
code/modules/cargo/packs/goodies.dm
View File

@@ -76,12 +76,6 @@
cost = 200
contains = list(/obj/item/toy/beach_ball)
/datum/supply_pack/goody/hell_single
name = "Hellgun Single-Pack"
desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
cost = 1500
contains = list(/obj/item/gun/energy/laser/hellgun)
/datum/supply_pack/goody/medipen_twopak
name = "Medipen Two-Pak"
desc = "Contains one standard epinephrine medipen and one standard emergency first-aid kit medipen. For when you want to prepare for the worst."