From 99b2955c09da7f9509faad9c495311f8de334802 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Mon, 9 Jun 2025 18:59:37 +0200 Subject: [PATCH] HOTFIX Revert #38004 : Change C-4 back to syndicate contraband (#38177) * Revert "Made C-4 Major contraband instead of syndicate contraband (#38004)" This reverts commit 0a565469c7f70414be68a5f7eedc863c4fac7705. * remove changelog --- Resources/Changelog/Changelog.yml | 7 ------- .../Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8d379607ae..c7125c98da 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3773,13 +3773,6 @@ id: 8597 time: '2025-06-01T15:48:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/38000 -- author: ToastEnjoyer - changes: - - message: C-4 is now listed under major contraband instead of syndicate. - type: Tweak - id: 8598 - time: '2025-06-01T21:09:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38004 - author: chromiumboy changes: - message: Atmospheric pipes can now be built on three different sublayers, allowing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 8edc3ec9a7..761e6513d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -38,7 +38,7 @@ - type: entity name: composition C-4 description: Used to put holes in specific areas without too much extra hole. A saboteur's favorite. - parent: [BasePlasticExplosive, BaseMajorContraband] + parent: [BasePlasticExplosive, BaseSyndicateContraband] id: C4 components: - type: Sprite -- 2.51.2