cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8227 from PsiOmegaDelta/Syndicate

Browse Source 
Fixes #8223.
This commit is contained in:
Zuhayr
2015-02-25 05:46:20 +10:30
parent a1afc3a48a afb7f7eff7
commit 24dacf0169
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/game_mode.dm
View File

@@ -36,7 +36,7 @@
new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, ".357", "RA"), new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, ".357", "RA"),
new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "9mm", "R9"), new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "9mm", "R9"),
new/datum/uplink_item(/obj/item/ammo_magazine/chemdart, 2, "Darts", "AD"), new/datum/uplink_item(/obj/item/ammo_magazine/chemdart, 2, "Darts", "AD"),
new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 3, "14.5mm", "RA") new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 3, "14.5mm", "SA")
), ),
"Highly Visible and Dangerous Weapons" = list( "Highly Visible and Dangerous Weapons" = list(
new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"), new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"),

4
code/game/objects/items/devices/uplinks.dm
View File

@@ -13,13 +13,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid
var/reference = "" var/reference = ""
var/description = "" var/description = ""
datum/uplink_item/New(var/itemPath, var/itemCost as num, var/itemName as text, var/itemReference as text, var/itemDescription) datum/uplink_item/New(var/itemPath, var/itemCost, var/itemName, var/itemReference, var/itemDescription)
cost = itemCost cost = itemCost
path = itemPath path = itemPath
name = itemName name = itemName
reference = itemReference
description = itemDescription description = itemDescription
datum/uplink_item/proc/description() datum/uplink_item/proc/description()
if(!description) if(!description)
// Fallback description // Fallback description