From 044635ba742fe43f2b5406c6703850d83e4d868a Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:31:21 +0500 Subject: [PATCH 1/9] Nuke mech Rebalance --- code/datums/uplink/uplink_items.dm | 1 + infinity/code/datums/uplink/badassery.dm | 22 +++++++++++++--------- infinity/code/datums/uplink/services.dm | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index d61b365ff5..ecf63f5f39 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -35,6 +35,7 @@ var/datum/uplink/uplink = new() var/list/datum/antagonist/antag_roles = list("Exclude", MODE_DEITY) // Antag roles this item is displayed to. If empty, display to all. If it includes 'Exclude", anybody except this role can view it /datum/uplink_item/item + var/global/MAX_MECH = 1 var/path = null /datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index 9f9c6542ac..d50f0efc74 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -61,19 +61,23 @@ antag_roles = list(MODE_MERCENARY) path = /obj/item/storage/backpack/dufflebag/syndie_kit/heavy -/datum/uplink_item/item/badassery/mech - name = "Syndicate Mech" - desc = "Special heavy mech with cool weaponery. It has: taser, laser and shield generator. Ideal for murderbone." - item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 2 - antag_roles = list(MODE_MERCENARY) - path = /mob/living/exosuit/premade/heavy/merc - /datum/uplink_item/item/badassery/mech name = "Combat Mech" + var/BOUGHT_MECH = 0 desc = "A terrible and at the same time beautiful combat mech to destroy all living things in your way. Comes with special plasma rifle, machinegun and shielding drone. Also, it is almoust EMP-proof!" - item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 2 + item_cost = 300 antag_roles = list(MODE_MERCENARY) - path = /mob/living/exosuit/premade/merc + +/datum/uplink_item/item/badassery/mech/get_goods(var/obj/item/device/uplink/U, var/loc) + if(MAX_MECH > 0) + MAX_MECH = MAX_MECH - 1 + BOUGHT_MECH = BOUGHT_MECH + 1 + if(BOUGHT_MECH == 2) + command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) + return new /mob/living/exosuit/premade/merc(loc,) + if(MAX_MECH == 0) + U.visible_message("[U.loc] Превышен лимит бронетехники для данной миссии. Обьявите войну для дополнительной единицы.\"") + return new /obj/item/stack/telecrystal(loc, 300) /datum/uplink_item/item/badassery/tobacco name = "Strong tobacco" diff --git a/infinity/code/datums/uplink/services.dm b/infinity/code/datums/uplink/services.dm index 56c7ae85d4..0712d4275c 100644 --- a/infinity/code/datums/uplink/services.dm +++ b/infinity/code/datums/uplink/services.dm @@ -9,4 +9,5 @@ U.visible_message("[U.loc] buzzez and declares, \"Unable to teleport telecrystals.\"") return 0 command_announcement.Announce("В секторе была замечена телепортация большого объема телекристаллов, использующихся Горлекскими Мародерами. Рекомендуется вызвать поддержку с ЦК для урегулирования ситуации.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) + MAX_MECH = MAX_MECH + 1 return new /obj/item/stack/telecrystal(loc, 781) From bde8c3e57692ff9080ba1c2b5cf5e6c18ac3b73f Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:05:09 +0500 Subject: [PATCH 2/9] Update code/datums/uplink/uplink_items.dm Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com> --- code/datums/uplink/uplink_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index ecf63f5f39..bad782f2c2 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -35,7 +35,7 @@ var/datum/uplink/uplink = new() var/list/datum/antagonist/antag_roles = list("Exclude", MODE_DEITY) // Antag roles this item is displayed to. If empty, display to all. If it includes 'Exclude", anybody except this role can view it /datum/uplink_item/item - var/global/MAX_MECH = 1 + var/static/MAX_MECH = 1 var/path = null /datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) From 88092cb39ed22a327d2027a9374c6524d9181139 Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:05:59 +0500 Subject: [PATCH 3/9] Update infinity/code/datums/uplink/services.dm Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com> --- infinity/code/datums/uplink/services.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinity/code/datums/uplink/services.dm b/infinity/code/datums/uplink/services.dm index 0712d4275c..41ddaeefca 100644 --- a/infinity/code/datums/uplink/services.dm +++ b/infinity/code/datums/uplink/services.dm @@ -9,5 +9,5 @@ U.visible_message("[U.loc] buzzez and declares, \"Unable to teleport telecrystals.\"") return 0 command_announcement.Announce("В секторе была замечена телепортация большого объема телекристаллов, использующихся Горлекскими Мародерами. Рекомендуется вызвать поддержку с ЦК для урегулирования ситуации.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) - MAX_MECH = MAX_MECH + 1 + MAX_MECH += 1 return new /obj/item/stack/telecrystal(loc, 781) From e0d98aa56bd350c43a26631c9a37c28054b7a262 Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:19:36 +0500 Subject: [PATCH 4/9] =?UTF-8?q?=D0=A2=D0=B8=D0=BF=D0=BE=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=BE=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infinity/code/datums/uplink/badassery.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index d50f0efc74..1f22943b05 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -69,15 +69,16 @@ antag_roles = list(MODE_MERCENARY) /datum/uplink_item/item/badassery/mech/get_goods(var/obj/item/device/uplink/U, var/loc) - if(MAX_MECH > 0) - MAX_MECH = MAX_MECH - 1 - BOUGHT_MECH = BOUGHT_MECH + 1 - if(BOUGHT_MECH == 2) - command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) - return new /mob/living/exosuit/premade/merc(loc,) if(MAX_MECH == 0) U.visible_message("[U.loc] Превышен лимит бронетехники для данной миссии. Обьявите войну для дополнительной единицы.\"") return new /obj/item/stack/telecrystal(loc, 300) + else + MAX_MECH-- + BOUGHT_MECH++ + return new /mob/living/exosuit/premade/merc(loc,) + if(BOUGHT_MECH == 2) + command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) + /datum/uplink_item/item/badassery/tobacco name = "Strong tobacco" From c0f89ca7db333e4920f1344bfa9405ec10a6b269 Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:30:27 +0500 Subject: [PATCH 5/9] Update badassery.dm --- infinity/code/datums/uplink/badassery.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index 1f22943b05..5e392bd64f 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -69,16 +69,14 @@ antag_roles = list(MODE_MERCENARY) /datum/uplink_item/item/badassery/mech/get_goods(var/obj/item/device/uplink/U, var/loc) - if(MAX_MECH == 0) + if(MAX_MECH <= 0) U.visible_message("[U.loc] Превышен лимит бронетехники для данной миссии. Обьявите войну для дополнительной единицы.\"") return new /obj/item/stack/telecrystal(loc, 300) - else - MAX_MECH-- - BOUGHT_MECH++ - return new /mob/living/exosuit/premade/merc(loc,) + MAX_MECH-- + BOUGHT_MECH++ if(BOUGHT_MECH == 2) command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) - + return new /mob/living/exosuit/premade/merc(loc,) /datum/uplink_item/item/badassery/tobacco name = "Strong tobacco" From db4dd15be3d95723d5d7294ed7d3d41f4d0ab50c Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:32:59 +0500 Subject: [PATCH 6/9] Update infinity/code/datums/uplink/badassery.dm Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com> --- infinity/code/datums/uplink/badassery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index 5e392bd64f..10fbdd5332 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -63,7 +63,7 @@ /datum/uplink_item/item/badassery/mech name = "Combat Mech" - var/BOUGHT_MECH = 0 + var/static/BOUGHT_MECH = 0 desc = "A terrible and at the same time beautiful combat mech to destroy all living things in your way. Comes with special plasma rifle, machinegun and shielding drone. Also, it is almoust EMP-proof!" item_cost = 300 antag_roles = list(MODE_MERCENARY) From 17932661c466989119403507121ef55aa1e9c8da Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:34:39 +0500 Subject: [PATCH 7/9] =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D0=B5=D1=80=D0=BD=D0=BE?= =?UTF-8?q?=D0=B5,=20=D0=BE=D0=BD=D0=BE=20=D1=81=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infinity/code/datums/uplink/badassery.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index 10fbdd5332..94437219bd 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -73,8 +73,7 @@ U.visible_message("[U.loc] Превышен лимит бронетехники для данной миссии. Обьявите войну для дополнительной единицы.\"") return new /obj/item/stack/telecrystal(loc, 300) MAX_MECH-- - BOUGHT_MECH++ - if(BOUGHT_MECH == 2) + if(++BOUGHT_MECH == 2) command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) return new /mob/living/exosuit/premade/merc(loc,) From a09116617f490ee31b6184fb417bff36bfa661a5 Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:35:15 +0500 Subject: [PATCH 8/9] Update services.dm --- infinity/code/datums/uplink/services.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinity/code/datums/uplink/services.dm b/infinity/code/datums/uplink/services.dm index 41ddaeefca..b215bcea5d 100644 --- a/infinity/code/datums/uplink/services.dm +++ b/infinity/code/datums/uplink/services.dm @@ -9,5 +9,5 @@ U.visible_message("[U.loc] buzzez and declares, \"Unable to teleport telecrystals.\"") return 0 command_announcement.Announce("В секторе была замечена телепортация большого объема телекристаллов, использующихся Горлекскими Мародерами. Рекомендуется вызвать поддержку с ЦК для урегулирования ситуации.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) - MAX_MECH += 1 + MAX_MECH++ return new /obj/item/stack/telecrystal(loc, 781) From b15f73baa48ede307909dd28e9d19e3d5ed05ef9 Mon Sep 17 00:00:00 2001 From: AmShegars <88627712+AmShegars@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:08:47 +0500 Subject: [PATCH 9/9] Update badassery.dm --- infinity/code/datums/uplink/badassery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infinity/code/datums/uplink/badassery.dm b/infinity/code/datums/uplink/badassery.dm index 94437219bd..8ed2a67dbc 100644 --- a/infinity/code/datums/uplink/badassery.dm +++ b/infinity/code/datums/uplink/badassery.dm @@ -75,7 +75,7 @@ MAX_MECH-- if(++BOUGHT_MECH == 2) command_announcement.Announce("В секторе была замечена телепортация большого количества бронетехники Мародёров Горлекса.", "Показания датчиков [station_name()]" , msg_sanitized = 1, zlevels = GLOB.using_map.station_levels) - return new /mob/living/exosuit/premade/merc(loc,) + return new /mob/living/exosuit/premade/merc(loc) /datum/uplink_item/item/badassery/tobacco name = "Strong tobacco"