From b989accb778fe37610d8ded5376057bd9ec4539f Mon Sep 17 00:00:00 2001 From: Azarak Date: Sun, 29 Nov 2020 17:09:02 +0100 Subject: [PATCH] [NON-MODULAR] The 30TC traitor update (#1744) * a * Update uplink_items.dm * Update uplink_items.dm * aaa * Update uplink_kits.dm * Update uplink_items.dm * Update uplink.dm * Update uplink_items.dm Co-authored-by: Gandalf --- code/datums/components/uplink.dm | 4 +++- code/game/machinery/syndicatebomb.dm | 8 ++++++++ code/game/objects/items/storage/uplink_kits.dm | 3 ++- code/modules/uplink/uplink_devices.dm | 9 ++++++--- code/modules/uplink/uplink_items.dm | 15 +++++++++++++-- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index b7ce377cfac..fae063cff75 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -29,7 +29,9 @@ var/list/previous_attempts -/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20) +///datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20) +/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 30) //SKYRAT EDIT CHANGE + if(!isitem(parent)) return COMPONENT_INCOMPATIBLE diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 87a067c0a27..c500d35c897 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -267,10 +267,18 @@ w_class = WEIGHT_CLASS_NORMAL resistance_flags = FLAMMABLE //Burnable (but the casing isn't) var/adminlog = null + //SKYRAT EDIT CHANGE BEGIN + /* var/range_heavy = 3 var/range_medium = 9 var/range_light = 17 var/range_flame = 17 + */ + var/range_heavy = 2 + var/range_medium = 6 + var/range_light = 12 + var/range_flame = 12 + //SKYRAT EDIT CHANGE END /obj/item/bombcore/ex_act(severity, target) // Little boom can chain a big boom. detonate() diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 2a9c7e2d106..43e8f637383 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -2,7 +2,8 @@ /obj/item/storage/box/syndicate /obj/item/storage/box/syndicate/bundle_a/PopulateContents() - switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1))) + //switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1))) //ORIGINAL + switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1))) //SKYRAT EDIT CHANGE if("recon") new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc? new /obj/item/storage/briefcase/launchpad(src) //6 tc diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index f57e3dd5671..dd919965d54 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -20,7 +20,8 @@ throw_range = 7 w_class = WEIGHT_CLASS_SMALL -/obj/item/uplink/Initialize(mapload, owner, tc_amount = 20) +///obj/item/uplink/Initialize(mapload, owner, tc_amount = 20) //ORIGINAL +/obj/item/uplink/Initialize(mapload, owner, tc_amount = 35) //SKYRAT EDIT CHANGE . = ..() AddComponent(/datum/component/uplink, owner, FALSE, TRUE, null, tc_amount) @@ -69,11 +70,13 @@ hidden_uplink.name = "dusty radio" // Multitool uplink -/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20) +///obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20) //ORIGINAL +/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 35) //SKYRAT EDIT CHANGE . = ..() AddComponent(/datum/component/uplink, owner, FALSE, TRUE, null, tc_amount) // Pen uplink -/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20) +///obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20) //ORIGINAL +/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 35) //SKYRAT EDIT CHANGE . = ..() AddComponent(/datum/component/uplink, owner, TRUE, FALSE, null, tc_amount) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 64e828b23e9..e5c098a086f 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -441,11 +441,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) include_modes = list(/datum/game_mode/nuclear) illegal_tech = FALSE +//SKYRAT EDIT REMOVAL BEGIN +/* /datum/uplink_item/dangerous/rapid name = "Gloves of the North Star" desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk." item = /obj/item/clothing/gloves/rapid cost = 8 +*/ +//SKYRAT EDIT REMOVAL END /datum/uplink_item/dangerous/guardian name = "Holoparasites" @@ -637,7 +641,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) On death, these nodules take control of the dead body, causing limited revivification, \ along with slurred speech, aggression, and the ability to infect others with this agent." item = /obj/item/storage/box/syndie_kit/romerol - cost = 25 + //cost = 25 //ORIGINAL + cost = 45 //SKYRAT EDIT CHANGE cant_discount = TRUE /datum/uplink_item/stealthy_weapons/sleepy_pen @@ -989,6 +994,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) surplus = 0 include_modes = list(/datum/game_mode/nuclear/clown_ops) +//SKYRAT EDIT REMOVAL BEGIN +/* /datum/uplink_item/explosives/detomatix name = "Detomatix PDA Cartridge" desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to \ @@ -997,6 +1004,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/cartridge/virus/syndicate cost = 6 restricted = TRUE +*/ +//SKYRAT EDIT REMOVAL END /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" @@ -1047,7 +1056,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) be defused, and some crew may attempt to do so. \ The bomb core can be pried out and manually detonated with other explosives." item = /obj/item/sbeacondrop/bomb - cost = 11 + //cost = 11 //ORIGINAL + cost = 18 //SKYRAT EDIT CHANGE + cant_discount = TRUE //SKYRAT EDIT ADDITION /datum/uplink_item/explosives/syndicate_bomb/emp name = "Syndicate EMP Bomb"