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

Merge pull request #11760 from Trilbyspaceclone/10mmchanges

Browse Source 
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
This commit is contained in:
kevinz000
2020-04-09 02:38:44 -07:00
committed by GitHub
parent 779766d1f6 cb1e6b518d
commit 22bf4cdb83
9 changed files with 157 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_items/uplink_ammo.dm
+36
View File
@@ -15,6 +15,12 @@
cost = 1
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistol/box
name = "Ammo Box - 10mm"
desc = "An additional box of 10mm ammo. The box has 20 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/c10mm
illegal_tech = FALSE
/datum/uplink_item/ammo/pistolap
name = "10mm Armour Piercing Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
@@ -23,6 +29,12 @@
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistolap/box
name = "Ammo Box - 10mm Armour Piercing"
desc = "An additional box of 10mm Armour Piercing ammo. The box has 20 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/c10mm/ap
illegal_tech = FALSE
/datum/uplink_item/ammo/pistolhp
name = "10mm Hollow Point Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
@@ -31,6 +43,12 @@
cost = 3
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistolhp/box
name = "Ammo Box - 10mm Hollow Point"
desc = "An additional box of 10mm Hollow Point ammo. The box has 20 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/c10mm/hp
illegal_tech = FALSE
/datum/uplink_item/ammo/pistolfire
name = "10mm Incendiary Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
@@ -39,6 +57,12 @@
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistolfire/box
name = "Ammo Box - 10mm Incendiary"
desc = "An additional box of 10mm Incendiary ammo. The box has 20 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/magazine/m10mm/fire
illegal_tech = FALSE
/datum/uplink_item/ammo/pistolzzz
name = "10mm Soporific Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. Loaded with soporific rounds that put the target to sleep. \
@@ -46,6 +70,12 @@
item = /obj/item/ammo_box/magazine/m10mm/soporific
cost = 2
/datum/uplink_item/ammo/pistolzzz/box
name = "Ammo Box - 10mm Soporific"
desc = "An additional box of 10mm Soporific ammo. The box has 20 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/c10mm/soporific
illegal_tech = FALSE
/datum/uplink_item/ammo/shotgun
cost = 2
include_modes = list(/datum/game_mode/nuclear)
@@ -212,6 +242,12 @@
cost = 2
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/pistolaps
name = "Ammo Box - 9mm"
desc = "An additional box of 9mm ammo. The box has 30 cases inside, does not come with a magazine."
item = /obj/item/ammo_box/c9mm
illegal_tech = FALSE
/datum/uplink_item/ammo/flechetteap
name = "Armor Piercing Flechette Magazine"
desc = "An additional 40-round flechette magazine; compatible with the Flechette Launcer. \
code/modules/uplink/uplink_items/uplink_dangerous.dm
+2 -2
View File
@@ -9,9 +9,9 @@
/datum/uplink_item/dangerous/pistol
name = "Stechkin Pistol"
desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
desc = "A sleek box containing a small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines. The handgun is compatible \
with suppressors."
item = /obj/item/gun/ballistic/automatic/pistol
item = /obj/item/storage/box/syndie_kit/pistol
cost = 7
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)