cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for TGstation upstream

Browse Source
This commit is contained in:
nevimer
2025-12-15 18:44:28 -05:00
parent 1a21687143
commit e82dd05cf1
16 changed files with 10 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+6 -30
View File
@@ -22,21 +22,12 @@
/// Someone, for the love of god, profile this. Is there a reason to cache mutable_appearance
/// if so, why are we JUST doing the airlocks when we can put this in mutable_appearance.dm for
/// everything
/proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block, state_color = null) // SKYRAT EDIT - Airlock accent greyscale color support - Added `state_color = null`
/proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block)
var/static/list/airlock_overlays = list()
var/base_icon_key = "[icon_state][REF(icon_file)][state_color]" // SKYRAT EDIT - Airlock accent greyscale color support - ORIGINAL: var/base_icon_key = "[icon_state][REF(icon_file)]"
var/base_icon_key = "[icon_state][REF(icon_file)]"
if(!(. = airlock_overlays[base_icon_key]))
/* SKYRAT EDIT - Airlock accent greyscale color support - ORIGINAL:
. = airlock_overlays[base_icon_key] = mutable_appearance(icon_file, icon_state)
*/ // SKYRAT EDIT START
var/mutable_appearance/airlock_overlay = mutable_appearance(icon_file, icon_state)
if(state_color)
airlock_overlay.color = state_color
. = airlock_overlays[base_icon_key] = airlock_overlay
// SKYRAT EDIT END
if(isnull(em_block))
return
@@ -54,12 +45,6 @@
// "Would this be better with a global var"
// Wires for the airlock are located in the datum folder, inside the wires datum folder.
// SKYRAT EDIT REMOVAL START - moved to code/__DEFINES/~skyrat_defines/airlock.dm
/*
#define AIRLOCK_FRAME_CLOSED "closed"
#define AIRLOCK_FRAME_CLOSING "closing"
#define AIRLOCK_FRAME_OPEN "open"
#define AIRLOCK_FRAME_OPENING "opening"
#define AIRLOCK_FRAME_CLOSED "closed"
#define AIRLOCK_FRAME_CLOSING "closing"
@@ -86,8 +71,6 @@
#define DOOR_CLOSE_WAIT 60 /// Time before a door closes, if not overridden
#define DOOR_VISION_DISTANCE 11 ///The maximum distance a door will see out to
*/
// SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm
/obj/machinery/door/airlock
name = "Airlock"
@@ -152,9 +135,9 @@
var/previous_airlock = /obj/structure/door_assembly
/// Material of inner filling; if its an airlock with glass, this should be set to "glass"
var/airlock_material
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
/// Used for papers and photos pinned to the airlock
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
/// Airlock pump that overrides airlock controlls when set up for cycling
var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump
@@ -585,7 +568,6 @@
else
icon_state = "[base_icon_state]closed"
/* SKYRAT EDIT MOVED TO AIRLOCK.DM IN AESTHETICS MODULE
/obj/machinery/door/airlock/update_overlays()
. = ..()
@@ -668,7 +650,6 @@
floorlight.pixel_w = -32
floorlight.pixel_z = 0
. += floorlight
*/
/obj/machinery/door/airlock/run_animation(animation, force_type = DEFAULT_DOOR_CHECKS)
if(animation == DOOR_DENY_ANIMATION)
@@ -680,7 +661,7 @@
/obj/machinery/door/airlock/animation_effects(animation, force_type = DEFAULT_DOOR_CHECKS)
if(force_type == BYPASS_DOOR_CHECKS)
playsound(src, soundin = forcedOpen, vol = 30, vary = TRUE) // BUBBER EDIT - AESTHETICS - ORIGINAL: playsound(src, soundin = 'sound/machines/airlock/airlockforced.ogg', vol = 30, vary = TRUE)
playsound(src, soundin = 'sound/machines/airlock/airlockforced.ogg', vol = 30, vary = TRUE)
return
switch(animation)
@@ -924,8 +905,7 @@
if(!istype(H.head, /obj/item/clothing/head/helmet))
H.visible_message(span_danger("[user] headbutts the airlock."), \
span_userdanger("You headbutt the airlock!"))
//H.Paralyze(100) - SKYRAT EDIT REMOVAL - COMBAT
H.StaminaKnockdown(10, TRUE, TRUE)
H.Paralyze(100)
H.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
else
visible_message(span_danger("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet."))
@@ -2638,8 +2618,6 @@
opacity = FALSE
glass = TRUE
// SKYRAT EDIT REMOVAL START - moved to code/__DEFINES/~skyrat_defines/airlock.dm
/*
#undef AIRLOCK_SECURITY_NONE
#undef AIRLOCK_SECURITY_IRON
#undef AIRLOCK_SECURITY_PLASTEEL_I_S
@@ -2664,5 +2642,3 @@
#undef AIRLOCK_FRAME_CLOSING
#undef AIRLOCK_FRAME_OPEN
#undef AIRLOCK_FRAME_OPENING
*/
// SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm