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

Merge branch 'master' into upstream-merge-26965

Browse Source
This commit is contained in:
LetterJay
2017-06-19 15:39:01 -05:00
committed by GitHub
parent a544d99f9f 8120278819
commit 42368581c5
423 changed files with 304918 additions and 166801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink.dm
+5 -1
View File
@@ -19,6 +19,7 @@ GLOBAL_LIST_EMPTY(uplinks)
var/spent_telecrystals = 0
var/purchase_log = ""
var/list/uplink_items
var/hidden_crystals = 0
/obj/item/device/uplink/Initialize()
. = ..()
@@ -57,7 +58,8 @@ GLOBAL_LIST_EMPTY(uplinks)
/obj/item/device/uplink/interact(mob/user)
active = TRUE
ui_interact(user)
if(user)
ui_interact(user)
/obj/item/device/uplink/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
@@ -119,6 +121,8 @@ GLOBAL_LIST_EMPTY(uplinks)
. = TRUE
if("lock")
active = FALSE
telecrystals += hidden_crystals
hidden_crystals = 0
SStgui.close_uis(src)
if("select")
selected_cat = params["category"]
code/modules/uplink/uplink_item.dm
+25 -16
View File
@@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/nukeoffer/sniper
name = "Sniper bundle"
desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollowpoint \
desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollow-point \
haemorrhage magazine, a soporific knockout magazine, a free surplus supressor, and a worn out suit and tie."
item = /obj/item/weapon/storage/briefcase/sniperbundle
cost = 20 // normally 26
@@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/dangerous/shotgun
name = "Bulldog Shotgun"
desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatiable with all 12g rounds. Designed for close \
desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
quarter anti-personnel engagements."
item = /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog
cost = 8
@@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!"
desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
item = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate
cost = 16
surplus = 25
@@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
fit into a pocket or slip into a bag unnoticed. It will synthesize \
and fire bolts tipped with a paralyzing toxin that will briefly stun \
targets and cause them to slur as if inebriated. It can produce an \
infinite amount of bolts, but takes time to automatically recharge \
infinite number of bolts, but takes time to automatically recharge \
after each shot."
item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow
cost = 12
@@ -455,22 +455,22 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/bag
name = "12g Ammo Duffelbag"
desc = "A duffelbag filled with enough 12g ammo to supply an entire team, at a discounted price."
name = "12g Ammo Dufflebag"
desc = "A dufflebag filled with enough 12g ammo to supply an entire team, at a discounted price."
item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun
cost = 12
/datum/uplink_item/ammo/smg
name = ".45 SMG Magazine"
desc = "An additional 20-round .45 magazine sutable for use with the C-20r submachine gun. \
desc = "An additional 20-round .45 magazine suitable for use with the C-20r submachine gun. \
These bullets pack a lot of punch that can knock most targets down, but do limited overall damage."
item = /obj/item/ammo_box/magazine/smgm45
cost = 3
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)
/datum/uplink_item/ammo/smg/bag
name = ".45 Ammo Duffelbag"
desc = "A duffelbag filled with enough .45 ammo to supply an entire team, at a discounted price."
name = ".45 Ammo Dufflebag"
desc = "A dufflebag filled with enough .45 ammo to supply an entire team, at a discounted price."
item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg
cost = 20
include_modes = list(/datum/game_mode/nuclear)
@@ -591,7 +591,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/support/mauler
name = "Mauler Exosuit"
desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targetting, thrust vectoring, \
desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring, \
and deployable smoke."
item = /obj/mecha/combat/marauder/mauler/loaded
cost = 140
@@ -686,7 +686,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
detonate PDAs of crewmembers who have their message feature enabled. \
The concussive effect from the explosion will knock the recipient out for a short period, and deafen \
them for longer. Beware, it has a chance to detonate your PDA."
item = /obj/item/weapon/cartridge/syndicate
item = /obj/item/weapon/cartridge/virus/syndicate
cost = 6
/datum/uplink_item/stealthy_weapons/suppressor
@@ -744,6 +744,15 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
exclude_modes = list(/datum/game_mode/nuclear)
player_minimum = 20
/datum/uplink_item/stealthy_tools/frame
name = "F.R.A.M.E. PDA Cartridge"
desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
You will recieve the unlock code upon activating the virus, and the new uplink may be charged with \
telecrystals normally."
item = /obj/item/weapon/cartridge/virus/frame
cost = 4
/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
name = "Stealthy No-Slip Chameleon Shoes"
desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \
@@ -856,7 +865,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/suits/hardsuit/elite
name = "Elite Syndicate Hardsuit"
desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit."
desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate hardsuit."
item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
cost = 8
include_modes = list(/datum/game_mode/nuclear)
@@ -923,7 +932,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/device_tools/thermal
name = "Thermal Imaging Glasses"
desc = "These goggles can be turned to resemble common eyewears throughout the station. \
desc = "These goggles can be turned to resemble common eyewear found throughout the station. \
They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \
emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
@@ -1059,7 +1068,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cost = 3
/datum/uplink_item/device_tools/assault_pod
name = "Assault Pod Targetting Device"
name = "Assault Pod Targeting Device"
desc = "Use to select the landing zone of your assault pod."
item = /obj/item/device/assault_pod
cost = 30
@@ -1336,8 +1345,8 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/badass/bundle
name = "Syndicate Bundle"
desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. \
These items are collectively worth more than 20 telecrystals, but you do not know which specialisation \
desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \
These items are collectively worth more than 20 telecrystals, but you do not know which specialization \
you will receive."
item = /obj/item/weapon/storage/box/syndicate
cost = 20
code/modules/uplink/uplink_item.dm.rej
+1 -10
View File
@@ -1,10 +1 @@
diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm (rejected hunks)
@@ -1312,7 +1312,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
continue
crate_value -= I.cost
new I.item(C)
- U.purchase_log += "<big>\icon[I.item]</big>"
+ U.purchase_log += "<big>[bicon(I.item)]</big>"
return C
poop