diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 4a0b0f4abb4..3f314079849 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -115,8 +115,8 @@ var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." var/alert_desc_red_upto = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." - var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." - var/alert_desc_delta = "The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." + var/alert_desc_red_downto = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." + var/alert_desc_delta = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." var/health_threshold_crit = 0 var/health_threshold_dead = -100 diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index d4bb7e0794b..79b65c3bc98 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -85,7 +85,8 @@ priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") else priority_announce("All hostile activity within station systems have ceased.","Network Alert") - if(gang) + if(get_security_level() == "delta") + set_security_level("red") ticker.mode.message_gangtools(((gang=="A") ? ticker.mode.A_tools : ticker.mode.B_tools),"Hostile takeover cancelled: Dominator is no longer operational.",1,1) SetLuminosity(0) icon_state = "dominator-broken" diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index c5d4b36c043..a6302fc2eea 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -122,8 +122,7 @@ B_timer = max(180,900 - ((round((B_territory.len/start_state.num_territories)*200, 1) - 60) * 15)) * modifier if(gang && dominatorloc) priority_announce("Hostile runtimes detected in all station systems. A network breach by the [gang_name(gang)] Gang has been located in [dominatorloc].","Network Alert") - if(get_security_level() != "delta") - set_security_level("red") + set_security_level("delta") SSshuttle.emergencyNoEscape = 1 /////////////////////////////////////////////////////////////////////////// diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 83fb9236d11..8aca6f11748 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -44,14 +44,12 @@ gang = type color = "#00b4ff" icon_state = gang_name("A") - desc = "A territory marker left by the [gang_name("A")] Gang." ticker.mode.A_territory_new |= list(territory.type = territory.name) ticker.mode.A_territory_lost -= territory.type else if(type == "B") gang = type color = "#ff3232" icon_state = gang_name("B") - desc = "A territory marker left by the [gang_name("B")] Gang." ticker.mode.B_territory_new |= list(territory.type = territory.name) ticker.mode.B_territory_lost -= territory.type diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 21762e82c38..ba5549140ca 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -235,6 +235,7 @@ name = "leather jacket" desc = "Pompadour not included." icon_state = "leatherjacket" + item_state = "hostrench" /obj/item/clothing/suit/jacket/leather/overcoat name = "leather overcoat" @@ -242,7 +243,6 @@ icon_state = "leathercoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS cold_protection = CHEST|GROIN|ARMS|LEGS - min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT /obj/item/clothing/suit/xenos name = "xenos suit" diff --git a/config/game_options.txt b/config/game_options.txt index 9c62544f085..ff0e47dc246 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -66,8 +66,8 @@ ALERT_GREEN All threats to the station have passed. Security may not have weapon ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted. ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed. ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised. -ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised. -ALERT_DELTA The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. +ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised. +ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. diff --git a/html/changelogs/Ikarrus-gangfashion.yml b/html/changelogs/Ikarrus-gangfashion.yml index 026e4f7ef7e..632ce4fa9c5 100644 --- a/html/changelogs/Ikarrus-gangfashion.yml +++ b/html/changelogs/Ikarrus-gangfashion.yml @@ -35,6 +35,6 @@ delete-after: True changes: - rscadd: "Wearing your gang's outfit now increases influence and shortens takeover time faster." - rscadd: "Added several more options for gang outfits" - - tweak: "Gang outfits are now slightly armored (10% melee, bullet, and laser) - - tweak: "Gang tags are now named "graffiti" to make them harder to detect + - tweak: "Gang outfits are now slightly armored" + - tweak: "Gang tags are now named 'graffiti' to make them harder to detect" - tweak: "Initial takeover timer is now capped at 5 minutes (50% control)" \ No newline at end of file