cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corporations II: Adds corporate discounts to the traitor uplink (#10197)

Browse Source 
* Adds corporate discounts to the traitor uplink

* Actually adds the manufacturing
This commit is contained in:
Nichlas Pihl
2020-11-01 19:13:57 +00:00
committed by GitHub
parent 21eec84e5f
commit 6e66e64e38
7 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/datums/components/uplink.dm
View File

@@ -182,8 +182,9 @@ GLOBAL_LIST_EMPTY(uplinks)
continue
cat["items"] += list(list(
"name" = I.name,
"cost" = I.cost,
"cost" = I.manufacturer && user.mind.is_employee(I.manufacturer) ? CEILING(I.cost * 0.8, 1) : I.cost,
"desc" = I.desc,
"manufacturer" = I.manufacturer ? initial(I.manufacturer.name) : null,
))
data["categories"] += list(cat)
return data
@@ -219,10 +220,14 @@ GLOBAL_LIST_EMPTY(uplinks)
return
if (!user || user.incapacitated())
return
if(telecrystals < U.cost || U.limited_stock == 0)
return
telecrystals -= U.cost
if(U.manufacturer && user.mind.is_employee(U.manufacturer))
if(telecrystals < CEILING(U.cost*0.8, 1) || U.limited_stock == 0)
return
telecrystals -= CEILING(U.cost*0.8, 1)
else
if(telecrystals < U.cost || U.limited_stock == 0)
return
telecrystals -= U.cost
U.purchase(user, src)

2
code/modules/antagonists/traitor/datum_traitor.dm
View File

@@ -24,7 +24,7 @@
if(traitor_kind == TRAITOR_AI)
company = /datum/corporation/self
else if(!company)
company = pick(subtypesof(/datum/corporation/syndicate))
company = pick(subtypesof(/datum/corporation/traitor))
owner.add_employee(company)
SSticker.mode.traitors += owner

12
code/modules/corporations/corporation.dm
View File

@@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY(corporations)
var/list/datum/mind/employees = list()
/// How much are employees paid per round of paydays as a modifier of their nanotrasen wage (nanotrasen is exempt, since that's integrated with budgets already)
var/paymodifier = 1
/// Whether we should instantiate it or not (only used on subtypes that are parents, like [/datum/corporation/syndicate])
/// Whether we should instantiate it or not (only used on subtypes that are parents, like [/datum/corporation/traitor])
var/instantiate = TRUE
/datum/corporation/New()
@@ -25,27 +25,27 @@ GLOBAL_LIST_EMPTY(corporations)
/// Nanotrasen's paying is handled by payday itself
paymodifier = 0
/datum/corporation/syndicate
/datum/corporation/traitor
instantiate = FALSE
/datum/corporation/syndicate/donkco
/datum/corporation/traitor/donkco
name = "Donk Co."
paymodifier = 2
instantiate = TRUE
/datum/corporation/syndicate/waffleco
/datum/corporation/traitor/waffleco
name = "Waffle co."
paymodifier = 1.5
instantiate = TRUE
/datum/corporation/syndicate/cybersun
/datum/corporation/traitor/cybersun
name = "Cybersun Industries"
paymodifier = 1.5
instantiate = TRUE
// Still syndicate, but doesn't send traitors so untill my syndicate rework they'll not be a subtype
/datum/corporation/bolsynpowell
name = "Bolsyn-Powell Front"
name = "Bosyn-Powell Front"
paymodifier = 1.5
// Shouldn't really pay anyone,

78
code/modules/uplink/uplink_items.dm
View File

@@ -106,6 +106,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
var/restricted = FALSE // Adds restrictions for VR/Events
var/list/restricted_species //Limits items to a specific species. Hopefully.
var/illegal_tech = TRUE // Can this item be deconstructed to unlock certain techweb research nodes?
/// the manufacturer of the item. Gives up to a 20% discount if you're from that corporation
var/datum/corporation/manufacturer
/datum/uplink_item/proc/get_discount()
return pick(4;0.75,2;0.5,1;0.25)
@@ -147,6 +149,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
cost = 30 // normally 42
manufacturer = /datum/corporation/traitor/donkco
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/bundles_TC/bulldog
@@ -169,6 +172,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
item = /obj/item/storage/box/cyber_implants
cost = 40
manufacturer = /datum/corporation/traitor/cybersun
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/bundles_TC/medical
@@ -328,6 +332,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Banana Cream Pie Cannon"
desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
item = /obj/item/pneumatic_cannon/pie/selfcharge
surplus = 0
include_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -442,6 +447,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
item = /obj/item/guardiancreator/tech
cost = 15
manufacturer = /datum/corporation/traitor/cybersun
surplus = 0
//exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //yogs: removes restrictions on liabilit- I mean punchghosts
player_minimum = 25
@@ -485,6 +491,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
item = /obj/item/melee/powerfist
cost = 6
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
@@ -522,6 +529,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
item = /obj/item/gun/ballistic/automatic/c20r/toy
cost = 5
manufacturer = /datum/corporation/traitor/donkco
surplus = 0
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -531,6 +539,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
riot grade darts, that can briefly incapacitate someone in just one volley."
item = /obj/item/gun/ballistic/automatic/l6_saw/toy
cost = 10
manufacturer = /datum/corporation/traitor/donkco
surplus = 0
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -540,6 +549,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
darts effective at incapacitating a target."
item = /obj/item/gun/ballistic/automatic/toy/pistol/riot
cost = 2
manufacturer = /datum/corporation/traitor/donkco
surplus = 10
// Stealthy Weapons
@@ -576,12 +586,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
your hand before use so it knows not to kill you."
item = /obj/item/toy/plush/carpplushie/dehy_carp
cost = 1
manufacturer = /datum/corporation/traitor/donkco
/datum/uplink_item/stealthy_weapons/edagger
name = "Energy Dagger"
desc = "A dagger made of energy that looks and functions as a pen when off."
item = /obj/item/pen/edagger
cost = 2
manufacturer = /datum/corporation/traitor/donkco
/datum/uplink_item/stealthy_weapons/martialarts
name = "Martial Arts Scroll"
@@ -611,6 +623,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
perfectly aerodynamic (and potentially lethal) paper airplanes."
item = /obj/item/storage/box/syndie_kit/origami_bundle
cost = 14
manufacturer = /datum/corporation/traitor/waffleco
surplus = 0
exclude_modes = list(/datum/game_mode/nuclear) //clown ops intentionally left in, because that seems like some s-tier shenanigans.
@@ -638,6 +651,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
falls asleep, they will be able to move and act."
item = /obj/item/pen/sleepy
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
exclude_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/stealthy_weapons/suppressor
@@ -839,6 +853,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
item = /obj/item/ammo_box/foambox/riot
cost = 2
manufacturer = /datum/corporation/traitor/donkco
surplus = 0
illegal_tech = FALSE
@@ -897,9 +912,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/explosives/buzzkill
name = "Buzzkill Grenade Box"
desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
with random toxins. Courtesy of the BLF and Tiger Cooperative."
with random toxins."
item = /obj/item/storage/box/syndie_kit/bee_grenades
cost = 6
manufacturer = /datum/corporation/bolsynpowell
surplus = 35
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -936,6 +952,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
be defused, and some crew may attempt to do so."
item = /obj/item/sbeacondrop/clownbomb
cost = 15
manufacturer = /datum/corporation/traitor/waffleco
surplus = 0
include_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -946,6 +963,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
item = /obj/item/cartridge/virus/syndicate
cost = 6
manufacturer = /datum/corporation/traitor/cybersun
restricted = TRUE
/datum/uplink_item/explosives/emp
@@ -954,12 +972,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
security's energy weapons and silicon lifeforms when you're in a tight spot."
item = /obj/item/storage/box/syndie_kit/emp
cost = 2
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/explosives/ducky
name = "Exploding Rubber Duck"
desc = "A seemingly innocent rubber duck. When placed, it arms, and will violently explode when stepped on."
item = /obj/item/deployablemine/traitor
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
include_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/explosives/virus_grenade
@@ -987,6 +1007,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
This variant has been fitted with high yield X4 charges for a larger explosion."
item = /obj/item/deployablemine/traitor/bigboom
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
include_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/explosives/pizza_bomb
@@ -995,6 +1016,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
opening the box again will trigger the detonation after the timer has elapsed. Comes with free pizza, for you or your target!"
item = /obj/item/pizzabox/bomb
cost = 6
manufacturer = /datum/corporation/traitor/donkco
surplus = 8
/datum/uplink_item/explosives/soap_clusterbang
@@ -1002,6 +1024,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A traditional clusterbang grenade with a payload consisting entirely of Syndicate soap. Useful in any scenario!"
item = /obj/item/grenade/clusterbuster/soap
cost = 3
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/explosives/syndicate_bomb
name = "Syndicate Bomb"
@@ -1038,6 +1061,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
remain attached to the face of all targets for one minute, preventing the use of breath masks and other such devices."
item = /obj/item/grenade/chem_grenade/teargas/moustache
cost = 3
manufacturer = /datum/corporation/traitor/waffleco
surplus = 0
include_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -1146,12 +1170,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
blind spots can help you identify escape routes."
item = /obj/item/multitool/ai_detect
cost = 1
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/stealthy_tools/syndireverse
name = "Bluespace Projectile Weapon Disrupter"
desc = "Hidden in an ordinary-looking playing card, this device will teleport an opponent's gun to your hand when they fire at you. Just make sure to hold this in your hand!"
item = /obj/item/syndicateReverseCard
cost = 1
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/stealthy_tools/chameleon
name = "Chameleon Kit"
@@ -1159,6 +1185,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Due to budget cuts, the shoes don't provide protection against slipping."
item = /obj/item/storage/box/syndie_kit/chameleon
cost = 2
manufacturer = /datum/corporation/traitor/cybersun
exclude_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/stealthy_tools/chameleon_proj
@@ -1167,6 +1194,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
move the projector from their hand. Disguised users move slowly, and projectiles pass over them."
item = /obj/item/chameleon
cost = 7
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/stealthy_tools/codespeak_manual
name = "Codespeak Manual"
@@ -1174,6 +1202,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
item = /obj/item/codespeak_manual/unlimited
cost = 3
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/stealthy_tools/combatbananashoes
name = "Combat Banana Shoes"
@@ -1192,6 +1221,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
item = /obj/item/flashlight/emp
cost = 2 //yogs no one uses this lol
manufacturer = /datum/corporation/traitor/donkco
surplus = 30
/datum/uplink_item/stealthy_tools/mulligan
@@ -1200,6 +1230,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
and appearance."
item = /obj/item/reagent_containers/syringe/mulligan
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
surplus = 30
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -1209,6 +1240,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
They do not work on heavily lubricated surfaces."
item = /obj/item/clothing/shoes/chameleon/noslip
cost = 2
manufacturer = /datum/corporation/traitor/waffleco
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
player_minimum = 20
@@ -1223,6 +1255,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
item = /obj/item/jammer
cost = 5
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/stealthy_tools/smugglersatchel
name = "Smuggler's Satchel"
@@ -1284,6 +1317,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
This pack contains three as well as a crayon for changing their appearances."
item = /obj/item/storage/box/syndie_kit/cutouts
cost = 1
manufacturer = /datum/corporation/traitor/waffleco
surplus = 20
/datum/uplink_item/device_tools/assault_pod
@@ -1321,6 +1355,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 0
item = /obj/item/storage/briefcase/launchpad
cost = 6
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/device_tools/camera_bug
name = "Camera Bug"
@@ -1328,6 +1363,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Bugging cameras allows you to disable them remotely."
item = /obj/item/camera_bug
cost = 1
manufacturer = /datum/corporation/traitor/cybersun
surplus = 90
/datum/uplink_item/device_tools/military_belt
@@ -1350,6 +1386,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Don't try to give this to us to complete your objective, we know better!"
item = /obj/item/disk/nuclear/fake
cost = 1
manufacturer = /datum/corporation/traitor/waffleco
surplus = 1
/datum/uplink_item/device_tools/frame
@@ -1360,6 +1397,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
telecrystals normally."
item = /obj/item/cartridge/virus/frame
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
restricted = TRUE
/datum/uplink_item/device_tools/failsafe
@@ -1367,6 +1405,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "When entered the uplink will self-destruct immediately."
item = /obj/effect/gibspawner/generic
cost = 1
manufacturer = /datum/corporation/traitor/waffleco
surplus = 0
restricted = TRUE
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -1395,12 +1434,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Be careful with wording, as artificial intelligences may look for loopholes to exploit."
item = /obj/item/aiModule/syndicate
cost = 4
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/device_tools/hypnotic_flash
name = "Hypnotic Flash"
desc = "A modified flash able to hypnotize targets. If the target is not in a mentally vulnerable state, it will only confuse and pacify them temporarily."
item = /obj/item/assembly/flash/hypnotic
cost = 7
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/device_tools/medgun
name = "Medbeam Gun"
@@ -1418,6 +1459,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
sends you a small beacon that will teleport the larger beacon to your location upon activation."
item = /obj/item/sbeacondrop
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
include_objectives = list(/datum/objective/hijack, /datum/objective/martyr) //yogs
/datum/uplink_item/device_tools/supermatter_delaminator
@@ -1428,6 +1470,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Comes with a secure radiation shielded containment box, special tweezers and usage instructions."
item = /obj/item/storage/box/syndie_kit/supermatter_delaminator
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
include_objectives = list(/datum/objective/hijack, /datum/objective/martyr) //yogs
/datum/uplink_item/device_tools/powersink
@@ -1437,6 +1480,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
item = /obj/item/powersink
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/device_tools/rad_laser
name = "Radioactive Microlaser"
@@ -1446,6 +1490,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
and wavelength, which controls the delay before the effect kicks in."
item = /obj/item/healthanalyzer/rad_laser
cost = 3
manufacturer = /datum/corporation/traitor/donkco
/datum/uplink_item/device_tools/stimpack
name = "Stimpack"
@@ -1470,6 +1515,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
You can also drop it underfoot to slip people."
item = /obj/item/soap/syndie
cost = 1
manufacturer = /datum/corporation/traitor/donkco
surplus = 50
/datum/uplink_item/device_tools/surgerybag
@@ -1521,6 +1567,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
The crew can move their funds to a new banking site though, unless they HODL, in which case they deserve it."
item = /obj/item/suspiciousphone
cost = 7
manufacturer = /datum/corporation/traitor/waffleco
limited_stock = 1
// Implants
@@ -1550,6 +1597,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
user from common restraints such as handcuffs."
item = /obj/item/storage/box/syndie_kit/imp_freedom
cost = 5
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/implants/microbomb
name = "Microbomb Implant"
@@ -1575,6 +1623,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
item = /obj/item/storage/box/syndie_kit/imp_radio
cost = 4
manufacturer = /datum/corporation/traitor/donkco
restricted = TRUE
/datum/uplink_item/implants/reviver
@@ -1590,6 +1639,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right. \
On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
item = /obj/item/storage/box/syndie_kit/imp_stealth
manufacturer = /datum/corporation/traitor/donkco
cost = 8
/datum/uplink_item/implants/storage
@@ -1626,6 +1676,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
illegal_tech = FALSE // This is a cheap knockoff of NT tech.
surplus = 5
cost = 1
manufacturer = /datum/corporation/traitor/waffleco
/datum/uplink_item/implants/xray
name = "X-ray Vision Implant"
@@ -1667,6 +1718,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Killer Tomatoes"
desc = "The Syndicates local gardeners brewed these up for our plant comrades (does not work against fellow plants)."
cost = 3
manufacturer = /datum/corporation/traitor/donkco
item = /obj/item/seeds/tomato/killer
restricted_species = list("pod")
@@ -1674,6 +1726,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Radiation grenade"
desc = "A radiation bomb guaranteed to irradiate the fuck out of non-gaseous lifeforms."
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
item = /obj/item/grenade/chem_grenade/radiation
restricted_species = list("plasmaman")
@@ -1703,6 +1756,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Banana Cream Pie Cannon"
desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
cost = 10
manufacturer = /datum/corporation/traitor/waffleco
item = /obj/item/pneumatic_cannon/pie/selfcharge
restricted_roles = list("Clown")
surplus = 0 //No fun unless you're the clown!
@@ -1713,13 +1767,16 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/autosurgeon/medibeam
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
cost = 8
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/role_restricted/cat_grenade
name = "Feral Cat Delivery Grenade"
desc = "The feral cat delivery grenade contains 5 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
item = /obj/item/grenade/spawnergrenade/feral_cats
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Psychiatrist")///why? Becuase its funny that a person in charge of your mental wellbeing has a cat granade..<---(he cant spell)
/datum/uplink_item/role_restricted/blastcannon
name = "Blast Cannon"
desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
@@ -1728,6 +1785,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield."
item = /obj/item/gun/blastcannon
cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Research Director", "Scientist")
/datum/uplink_item/role_restricted/gorillacubes
@@ -1736,6 +1794,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Caution: Product may rehydrate when exposed to water."
item = /obj/item/storage/box/gorillacubes
cost = 6
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Geneticist", "Chief Medical Officer")
/datum/uplink_item/role_restricted/brainwash_disk
@@ -1745,6 +1804,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/disk/surgery/brainwashing
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Roboticist")
cost = 5
manufacturer = /datum/corporation/traitor/cybersun
/datum/uplink_item/role_restricted/clown_bomb
name = "Clown Bomb"
@@ -1755,6 +1815,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
be defused, and some crew may attempt to do so."
item = /obj/item/sbeacondrop/clownbomb
cost = 15
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Clown")
/datum/uplink_item/role_restricted/spider_injector
@@ -1765,8 +1826,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
also give them a bit of sentience though."
item = /obj/item/reagent_containers/syringe/spider_extract
cost = 25 //yogs - increase price to reduce grief potential
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Research Director", "Scientist", "Roboticist")
include_objectives = list(/datum/objective/hijack, /datum/objective/martyr) //yogs
include_objectives = list(/datum/objective/hijack, /datum/objective/martyr) //yogs // >Increase price to reduce grief > limit it to hijack only :think:
/datum/uplink_item/role_restricted/clowncar
name = "Clown Car"
@@ -1787,6 +1849,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Only one can fit on a mecha."
item = /obj/item/mecha_parts/concealed_weapon_bay
cost = 3
manufacturer = /datum/corporation/traitor/donkco
restricted_roles = list("Roboticist", "Research Director")
/datum/uplink_item/role_restricted/haunted_magic_eightball
@@ -1795,6 +1858,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
item = /obj/item/toy/eightball/haunted
cost = 2
manufacturer = /datum/corporation/traitor/donkco
restricted_roles = list("Chaplain","Curator")
limited_stock = 1 //please don't spam deadchat
@@ -1815,6 +1879,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
item = /obj/item/hot_potato/syndicate
cost = 4
manufacturer = /datum/corporation/traitor/waffleco
surplus = 0
restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
@@ -1824,6 +1889,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
The acid only affects carbon-based creatures."
item = /obj/item/storage/box/syndie_kit/ez_clean
cost = 6
manufacturer = /datum/corporation/traitor/waffleco
surplus = 20
restricted_roles = list("Janitor")
@@ -1842,6 +1908,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Occupies 35% mod capacity."
item = /obj/item/borg/upgrade/modkit/indoors
cost = 5 //you need two for full damage, so total of 10 for maximum damage
manufacturer = /datum/corporation/traitor/donkco // Unless you're donk co, then it's 8
limited_stock = 2 //you can't use more than two!
restricted_roles = list("Shaft Miner")
@@ -1851,6 +1918,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
item = /obj/item/reagent_containers/hypospray/magillitis
cost = 15
manufacturer = /datum/corporation/traitor/waffleco
restricted_roles = list("Geneticist", "Chief Medical Officer")
/datum/uplink_item/role_restricted/modified_syringe_gun
@@ -1881,6 +1949,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A revolver that always fires at its user. \"Accidentally\" drop your weapon, then watch as the greedy corporate pigs blow their own brains all over the wall. \
The revolver itself is actually real. Only clumsy people, and clowns, can fire it normally. Comes in a box of hugs. Honk."
cost = 14
manufacturer = /datum/corporation/traitor/waffleco
item = /obj/item/storage/box/hug/reverse_revolver
restricted_roles = list("Clown")
@@ -1888,6 +1957,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Hierophant's Antenna"
desc = "Amplifies the reception signals of the hierophant staff, allows the herald's power to reach the station!"
cost = 14
manufacturer = /datum/corporation/traitor/cybersun
item = /obj/item/hierophant_antenna
restricted_roles = list("Shaft Miner")
@@ -1958,6 +2028,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
You can also play card games with them or leave them on your victims."
item = /obj/item/toy/cards/deck/syndicate
cost = 1
manufacturer = /datum/corporation/traitor/donkco
surplus = 40
/datum/uplink_item/badass/syndiecigs
@@ -1965,6 +2036,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "Strong flavor, dense smoke, infused with omnizine."
item = /obj/item/storage/box/fancy/cigarettes/cigpack_syndicate
cost = 2
manufacturer = /datum/corporation/traitor/donkco
illegal_tech = FALSE
/datum/uplink_item/badass/antagcape
@@ -1979,4 +2051,4 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A cape to show off your grand villainous deeds."
item = /obj/item/clothing/neck/skillcape/trimmed/antag
cost = 20
illegal_tech = FALSE
illegal_tech = FALSE

2
tgui/packages/tgui/interfaces/Uplink.js
View File

@@ -189,6 +189,8 @@ const ItemList = (props, context) => {
})} />
)}>
{decodeHtmlEntities(item.desc)}
<br />
{item.manufacturer ? "Brought to you by: " + decodeHtmlEntities(item.manufacturer): ""}
</Section>
));
};

2
tgui/packages/tgui/public/tgui.bundle.js
View File

File diff suppressed because one or more lines are too long

1
yogstation/code/modules/uplink/uplink_item.dm
View File

@@ -107,6 +107,7 @@
desc = "An implant injected into another body, forcing the victim to obey any command by the user."
item = /obj/item/storage/box/syndie_kit/imp_mindslave
cost = 7
manufacturer = /datum/corporation/traitor/cybersun
surplus = 20
/datum/uplink_item/implants/greytide