From afb7f7eff7754ada48d25634e138202d2eaa292f Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 24 Feb 2015 12:27:03 +0100 Subject: [PATCH] Fixes #8223. Restores a lost, somewhat important, line. Fixes a duplicate uplink item reference. --- code/game/gamemodes/game_mode.dm | 2 +- code/game/objects/items/devices/uplinks.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index d39a025cbd..3e853436fd 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -36,7 +36,7 @@ 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/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( new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"), diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 4ee5491c0c..b2ac742a7c 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -13,13 +13,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/reference = "" 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 path = itemPath name = itemName + reference = itemReference description = itemDescription - datum/uplink_item/proc/description() if(!description) // Fallback description