From 4b0f774cdc5f0f8472081fb60b94ba6995e57843 Mon Sep 17 00:00:00 2001 From: Code-Lyoko0 Date: Mon, 22 Apr 2024 05:29:06 -0500 Subject: [PATCH 01/19] make the station not go into delta alert when the Death Squad arms the nuke (#25163) --- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index f1b09f316e2..327bc892abf 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -504,7 +504,7 @@ GLOBAL_VAR(bomb_set) update_icon(UPDATE_OVERLAYS) if(!safety) message_admins("[key_name_admin(usr)] engaged a nuclear bomb [ADMIN_JMP(src)]") - if(!is_syndicate) + if(!is_syndicate && SSsecurity_level.get_current_level_as_number() != SEC_LEVEL_EPSILON) SSsecurity_level.set_level(SEC_LEVEL_DELTA) GLOB.bomb_set = TRUE // There can still be issues with this resetting when there are multiple bombs. Not a big deal though for Nuke else From 5fe22f485c028615f76f9acbf666daa15ecabadf Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:00:03 -0500 Subject: [PATCH 02/19] permits mobs with chunky fingers to fire blowgun (#25176) --- code/modules/projectiles/guns/syringe_gun.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 7c678e630ca..c930fb9efa2 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -406,6 +406,7 @@ desc = "Fire syringes at a short distance." icon_state = "blowgun" item_state = "gun" + trigger_guard = TRIGGER_GUARD_ALLOW_ALL // you fire it with your mouth /obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) if(chambered.BB) From fdea9d76692f7f384a9b5dc09dd50fcce8c55fb5 Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Mon, 22 Apr 2024 23:08:45 +1000 Subject: [PATCH 03/19] Update cerestation.dmm (#25190) --- _maps/map_files/stations/cerestation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index ccc69336a86..b5c68898d43 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -63932,6 +63932,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "nta" = ( From 15483d1b88885e807ffc538f3e0cab2484505c08 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon, 22 Apr 2024 21:32:52 +0100 Subject: [PATCH 04/19] Add modern equivalents of legacy IE-only CSS rules/properties (#25205) * alternatives to legacy -ms stuff from TGUI * tgui build * bundle * rebuild --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> --- .../tgui-panel/styles/tgchat/chat-dark.scss | 2 +- .../tgui-panel/styles/tgchat/chat-light.scss | 8 +- tgui/packages/tgui/components/NanoMap.js | 3 +- .../tgui/interfaces/CloningConsole.js | 3 +- .../tgui/interfaces/MedicalRecords.js | 3 +- tgui/packages/tgui/interfaces/PdaPainter.js | 9 +- .../tgui/interfaces/SecurityRecords.js | 3 +- tgui/packages/tgui/interfaces/StripMenu.tsx | 3 +- .../tgui/interfaces/pda/pda_mob_hunt.js | 3 +- .../tgui/styles/components/Button.scss | 2 +- .../packages/tgui/styles/components/Flex.scss | 2 +- .../tgui/styles/components/Input.scss | 15 +++ .../tgui/styles/components/TextArea.scss | 7 ++ .../tgui/styles/interfaces/Contractor.scss | 3 +- .../tgui/styles/interfaces/Newscaster.scss | 6 +- .../tgui/styles/layouts/TitleBar.scss | 2 +- tgui/packages/tgui/styles/themes/paper.scss | 7 ++ tgui/public/tgui-panel.bundle.css | 2 +- tgui/public/tgui-panel.bundle.js | 2 +- tgui/public/tgui-say.bundle.css | 2 +- tgui/public/tgui.bundle.css | 2 +- tgui/public/tgui.bundle.js | 110 +++++++++--------- 22 files changed, 117 insertions(+), 82 deletions(-) diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 996aacc3bf1..1e72f6edd8f 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -12,7 +12,7 @@ img { margin: 0; padding: 0; line-height: 1; - -ms-interpolation-mode: nearest-neighbor; + -ms-interpolation-mode: nearest-neighbor; // TODO: Remove with 516 image-rendering: pixelated; } diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index b2f85f3195c..42970e8f119 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -30,7 +30,7 @@ img { margin: 0; padding: 0; line-height: 1; - -ms-interpolation-mode: nearest-neighbor; + -ms-interpolation-mode: nearest-neighbor; // TODO: Remove with 516 image-rendering: pixelated; } @@ -183,12 +183,6 @@ a.popt { padding: 2px 0; } -.filterMessages input { -} - -.filterMessages label { -} - .icon-stack { height: 1em; line-height: 1em; diff --git a/tgui/packages/tgui/components/NanoMap.js b/tgui/packages/tgui/components/NanoMap.js index a745cd1f38c..318933dbbe4 100644 --- a/tgui/packages/tgui/components/NanoMap.js +++ b/tgui/packages/tgui/components/NanoMap.js @@ -118,7 +118,8 @@ export class NanoMap extends Component { top: '50%', left: '50%', transform: 'translate(-50%, -50%)', - '-ms-interpolation-mode': 'nearest-neighbor', + '-ms-interpolation-mode': 'nearest-neighbor', // TODO: Remove with 516 + 'image-rendering': 'pixelated', }; return ( diff --git a/tgui/packages/tgui/interfaces/CloningConsole.js b/tgui/packages/tgui/interfaces/CloningConsole.js index 9020d13f31b..e7819e6d44d 100644 --- a/tgui/packages/tgui/interfaces/CloningConsole.js +++ b/tgui/packages/tgui/interfaces/CloningConsole.js @@ -86,7 +86,8 @@ const CloningConsoleMain = (props, context) => { )} style={{ width: '100%', - '-ms-interpolation-mode': 'nearest-neighbor', + '-ms-interpolation-mode': 'nearest-neighbor', // TODO: Remove with 516 + 'image-rendering': 'pixelated', }} />