From 70eda569f9b5db63c886aab2ee9467c2a35c4c3d Mon Sep 17 00:00:00 2001 From: Hypertorus Fusion Reactor <109750345+dis-integrates-the-integration-tests@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:05:24 +0200 Subject: [PATCH 1/2] Removes Syndicate Bombs (the gargantuan one) from Syndicate Uplink. (#2046) remove syndibomb from uplinkie --- code/modules/uplink/uplink_items/explosive.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index 8a2c33f43ae..0f9ebb7d161 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -86,7 +86,7 @@ ..() if(HAS_TRAIT(SSstation, STATION_TRAIT_CYBERNETIC_REVOLUTION)) cost *= 2 - +/* // NOVA EDIT REMOVAL START /datum/uplink_item/explosives/syndicate_bomb name = "Syndicate Bomb" desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \ @@ -102,3 +102,4 @@ /datum/uplink_item/explosives/syndicate_bomb/New() . = ..() desc = replacetext(desc, "%MIN_BOMB_TIMER", SYNDIEBOMB_MIN_TIMER_SECONDS) +*/ // NOVA EDIT REMOVAL END From 9f294bb92e5ee63c716abbf9f0d02975553ab4a6 Mon Sep 17 00:00:00 2001 From: mogeoko Date: Thu, 25 Apr 2024 19:42:21 +0200 Subject: [PATCH 2/2] FF edit Reverted bomb deletion. RICO KABOOM --- code/modules/uplink/uplink_items/explosive.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index 0f9ebb7d161..d09474c3bfe 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -86,7 +86,7 @@ ..() if(HAS_TRAIT(SSstation, STATION_TRAIT_CYBERNETIC_REVOLUTION)) cost *= 2 -/* // NOVA EDIT REMOVAL START +// // NOVA EDIT REMOVAL START // FF edit begin - reverted it back /datum/uplink_item/explosives/syndicate_bomb name = "Syndicate Bomb" desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \ @@ -102,4 +102,4 @@ /datum/uplink_item/explosives/syndicate_bomb/New() . = ..() desc = replacetext(desc, "%MIN_BOMB_TIMER", SYNDIEBOMB_MIN_TIMER_SECONDS) -*/ // NOVA EDIT REMOVAL END +// // NOVA EDIT REMOVAL END // FF edit end