diff --git a/code/game/objects/structures/crates_lockers/closets/phonebox.dm b/code/game/objects/structures/crates_lockers/closets/phonebox.dm index 7c887dda1387..14615add194d 100644 --- a/code/game/objects/structures/crates_lockers/closets/phonebox.dm +++ b/code/game/objects/structures/crates_lockers/closets/phonebox.dm @@ -88,12 +88,12 @@ update_icon() /obj/structure/machinery/phonebox/allow_drop() - return 0 + return FALSE /obj/structure/machinery/phonebox/relaymove(mob/user as mob) if(user.stat) return - src.go_out() + go_out() return /obj/structure/machinery/phonebox/update_icon() @@ -101,14 +101,14 @@ if(stat & NOPOWER) if(!open) icon_state = "phonebox_off_empty_closed" - if(src.occupant) + if(occupant) icon_state = "phonebox_off_full_closed" else icon_state = "phonebox_off_open" else if(!open) icon_state = "phonebox_on_empty_closed" - if(src.occupant) + if(occupant) icon_state = "phonebox_on_full_closed" else icon_state = "phonebox_on_open" @@ -144,10 +144,10 @@ M.client.perspective = EYE_PERSPECTIVE M.client.eye = src M.forceMove(src) - src.occupant = M + occupant = M start_processing() - src.add_fingerprint(usr) - src.open = FALSE + add_fingerprint(usr) + open = FALSE update_icon() return TRUE @@ -158,16 +158,16 @@ set src in oview(1) if (usr.stat != 0) return - src.go_out() + go_out() add_fingerprint(usr) return /obj/structure/machinery/phonebox/attack_hand(mob/living/user) - if(src.open) - src.open = FALSE + if(open) + open = FALSE else - src.open = TRUE - src.go_out() + open = TRUE + go_out() update_icon() diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index b31c53897dc3..cdf8a72ac6e5 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -313,15 +313,15 @@ GLOBAL_LIST_INIT(all_fences, list()) spark_system.start(src) /obj/structure/fence/electrified/attackby(obj/item/W, mob/user) - if(src.electrified && !src.cut) + if(electrified && !cut) if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/human = user if(human.gloves) - var/obj/item/clothing/gloves/G = human.gloves - if(G.siemens_coefficient != 0) - src.electrocute_human(human) + var/obj/item/clothing/gloves/worn_gloves = human.gloves + if(worn_gloves.siemens_coefficient != 0) + electrocute_human(human) else - src.electrocute_human(human) + electrocute_human(human) . = ..() /obj/structure/fence/electrified/ex_act(severity) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index c8b2829fbdbf..633bb70d3aec 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -1057,7 +1057,7 @@ basestate = "strata_window" desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE window_frame = /obj/structure/window_frame/hybrisa/colony/reinforced /obj/structure/window/framed/hybrisa/colony/hull @@ -1086,7 +1086,7 @@ basestate = "strata_window" desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE window_frame = /obj/structure/window_frame/hybrisa/research/reinforced /obj/structure/window/framed/hybrisa/research/hull @@ -1111,7 +1111,7 @@ name = "reinforced window" desc = "A glass window with a special rod matrix inside a wall frame. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE icon_state = "prison_rwindow0" basestate = "prison_rwindow" window_frame = /obj/structure/window_frame/hybrisa/marshalls/reinforced @@ -1138,7 +1138,7 @@ basestate = "strata_window" desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE window_frame = /obj/structure/window_frame/hybrisa/colony/hospital/reinforced /obj/structure/window/framed/hybrisa/colony/hospital/hull @@ -1168,7 +1168,7 @@ basestate = "strata_window" desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE window_frame = /obj/structure/window_frame/hybrisa/colony/office/reinforced /obj/structure/window/framed/hybrisa/colony/office/hull @@ -1198,7 +1198,7 @@ basestate = "strata_window" desc = "A glass window. Light refracts incorrectly when looking through. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE window_frame = /obj/structure/window_frame/hybrisa/colony/engineering/reinforced /obj/structure/window/framed/hybrisa/colony/engineering/hull @@ -1223,7 +1223,7 @@ name = "reinforced window" desc = "A glass window with a special rod matrix inside a wall frame. It looks rather strong. Might take a few good hits to shatter it." health = 100 - reinf = 1 + reinf = TRUE icon_state = "prison_rwindow0" basestate = "prison_rwindow" window_frame = /obj/structure/window_frame/hybrisa/spaceport/reinforced diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 57dc2480bf65..207d1c21d7fc 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1343,7 +1343,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon = 'icons/turf/walls/engineership.dmi' icon_state = "metal"//DMI specific name walltype = WALL_HUNTERSHIP - hull = 1 + hull = TRUE // Rock /turf/closed/wall/hybrisa/rock @@ -1352,7 +1352,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon = 'icons/turf/walls/kutjevorockdark.dmi' icon_state = "rock" walltype = WALL_KUTJEVO_ROCK - hull = 1 + hull = TRUE // Marshalls /turf/closed/wall/hybrisa/marhsalls @@ -1372,7 +1372,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon = 'icons/turf/walls/hybrisa_marshalls.dmi' icon_state = "hwall" walltype = WALL_REINFORCED - hull = 1 + hull = TRUE // Research @@ -1399,7 +1399,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) damage_cap = HEALTH_WALL_REINFORCED /turf/closed/wall/hybrisa/research/reinforced/hull - hull = 1 + hull = TRUE icon_state = "strata_hull" desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible." @@ -1427,7 +1427,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) damage_cap = HEALTH_WALL_REINFORCED /turf/closed/wall/hybrisa/colony/reinforced/hull - hull = 1 + hull = TRUE icon_state = "strata_hull" desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible." @@ -1456,7 +1456,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) damage_cap = HEALTH_WALL_REINFORCED /turf/closed/wall/hybrisa/colony/hospital/reinforced/hull - hull = 1 + hull = TRUE icon_state = "strata_hull" desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible." @@ -1512,7 +1512,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) damage_cap = HEALTH_WALL_REINFORCED /turf/closed/wall/hybrisa/colony/engineering/reinforced/hull - hull = 1 + hull = TRUE icon_state = "strata_hull" desc = "A thick and chunky metal wall that is, just by virtue of its placement and imposing presence, entirely indestructible." @@ -1534,4 +1534,4 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon = 'icons/turf/walls/hybrisa_spaceport_walls.dmi' icon_state = "hwall" walltype = WALL_REINFORCED - hull = 1 + hull = TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index d7e3e74c78e0..c610ba2742ea 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -514,7 +514,7 @@ return XENO_ATTACK_ACTION /obj/structure/fence/electrified/attack_alien(mob/living/carbon/xenomorph/M) - if(src.electrified && !src.cut) //this is placeholder, needs to be updated + if(electrified && !cut) //this is placeholder, needs to be updated electrocute_xenomorph(M) . = ..() diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 3a750889cd5f..0a3ff39860c5 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -25,27 +25,27 @@ min_oxy = 16 //Require atleast 16kPA oxygen minbodytemp = 223 //Below -50 Degrees Celcius maxbodytemp = 323 //Above 50 Degrees Celcius - universal_speak = 0 - universal_understand = 1 + universal_speak = FALSE + universal_understand = TRUE holder_type = /obj/item/holder/rat /mob/living/simple_animal/rat/Life(delta_time) ..() if(!stat && prob(speak_chance)) - for(var/mob/M in view()) - M << 'sound/effects/mousesqueek.ogg' + for(var/mob/cur_mob in view()) + cur_mob << 'sound/effects/mousesqueek.ogg' if(!ckey && stat == CONSCIOUS && prob(0.5)) set_stat(UNCONSCIOUS) icon_state = "rat_[body_color]_sleep" - wander = 0 + wander = FALSE speak_chance = 0 //snuffles else if(stat == UNCONSCIOUS) if(ckey || prob(1)) set_stat(CONSCIOUS) icon_state = "rat_[body_color]" - wander = 1 + wander = TRUE else if(prob(5)) INVOKE_ASYNC(src, PROC_REF(emote), "snuffles") @@ -72,10 +72,10 @@ PF.flags_pass = PASS_FLAGS_CRAWLER /mob/living/simple_animal/rat/splat(mob/killer) - src.health = 0 - src.set_stat(DEAD) - src.icon_dead = "rat_[body_color]_splat" - src.icon_state = "rat_[body_color]_splat" + health = 0 + set_stat(DEAD) + icon_dead = "rat_[body_color]_splat" + icon_state = "rat_[body_color]_splat" layer = ABOVE_LYING_MOB_LAYER if(client) client.time_died_as_mouse = world.time @@ -89,11 +89,11 @@ if(!ckey && stat == UNCONSCIOUS) set_stat(CONSCIOUS) icon_state = "rat_[body_color]" - wander = 1 + wander = TRUE else if(!stat && prob(5)) - var/mob/M = AM - to_chat(M, SPAN_NOTICE(" [icon2html(src, M)] Squeek!")) - M << 'sound/effects/mousesqueek.ogg' + var/mob/crossed_mob = AM + to_chat(crossed_mob, SPAN_NOTICE(" [icon2html(src, crossed_mob)] Squeek!")) + crossed_mob << 'sound/effects/mousesqueek.ogg' ..() /mob/living/simple_animal/rat/death() @@ -111,8 +111,7 @@ if(H.a_intent == INTENT_HELP) get_scooped(H) return - else - return ..() + return ..() /mob/living/simple_animal/rat/get_scooped(mob/living/carbon/grabber) if (stat >= DEAD) diff --git a/colonialmarines.dme b/colonialmarines.dme index 92cc83421c52..c24852210c52 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2493,5 +2493,4 @@ #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\_basemap.dm" -#include "maps\map_files\LV759_Hybrisa_Prospera\LV759_Hybrisa_Prospera.dmm" // END_INCLUDE diff --git a/html/changelogs/AutoChangeLog-pr-6244.yml b/html/changelogs/AutoChangeLog-pr-6244.yml deleted file mode 100644 index 8214c4f8e099..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6244.yml +++ /dev/null @@ -1,19 +0,0 @@ -author: "Drathek, mullenpaul" -delete-after: True -changes: - - ui: "Finalizes the TGUI React port and brings us back into parity again with TG's interface components" - - ui: "Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same." - - ui: "VOX panel's second tab now doesn't overlap the other buttons" - - ui: "Wiring panel for some machines is now restored to use circular indicators again" - - ui: "Smart fridge interface is more in line with sorted inventories as far as layout & tooltips" - - ui: "Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date)" - - ui: "Reworks RestrictedInput number handling" - - ui: "Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet)" - - ui: "Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity" - - ui: "Updates the ship manipulator window to allow replacing any Shuttle" - - ui: "Fixes the supply pod panel not displaying its byondui map correctly" - - ui: "Fixes the research terminal duplicating papers in display old mode." - - ui: "Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc" - - bugfix: "Fixes thinking runtimes when quickly switching between tgsay categories" - - code_imp: "Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold)" - - bugfix: "Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6251.yml b/html/changelogs/AutoChangeLog-pr-6251.yml deleted file mode 100644 index 1ccb100b5d5b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6251.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "vero5123" -delete-after: True -changes: - - qol: "Toggleable ammo counter, can now cycle between displaying every fifth or single bullet." - - bugfix: "Light attachments will no longer automatically turn on when the weapon is equipped from suit storage" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6291.yml b/html/changelogs/AutoChangeLog-pr-6291.yml deleted file mode 100644 index 2436dfbc8094..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6291.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - balance: "Latejoin marines to larva ratio changed to 1:4 for the first 15 minutes, going back to 1:2.5 afterwards." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6297.yml b/html/changelogs/AutoChangeLog-pr-6297.yml deleted file mode 100644 index dea586c0acf7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6297.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "HeresKozmos" -delete-after: True -changes: - - mapadd: "Added three new tunnels to New Varadero." - - maptweak: "Adjusts placement of some existing tunnels on New Varadero." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6300.yml b/html/changelogs/AutoChangeLog-pr-6300.yml deleted file mode 100644 index 21c74020de61..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6300.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Nomoresolvalou" -delete-after: True -changes: - - balance: "unpowered doors are now opened instantly in maintenance jack crowbar mode instead of in three seconds." - - balance: "crowbar mode can now pry doors closed when unpowered." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6302.yml b/html/changelogs/AutoChangeLog-pr-6302.yml deleted file mode 100644 index 300948e5ccdf..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6302.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - qol: "Changed the Queen's pointing color to purple" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6303.yml b/html/changelogs/AutoChangeLog-pr-6303.yml deleted file mode 100644 index 1810854997f4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6303.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "doganesi" -delete-after: True -changes: - - bugfix: "Fixed some oversights with custom loadout provided weapon boxes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6305.yml b/html/changelogs/AutoChangeLog-pr-6305.yml deleted file mode 100644 index cba43318a117..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6305.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Doubleumc" -delete-after: True -changes: - - qol: "squad/queen/leader trackers can find targets in interiors" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6306.yml b/html/changelogs/AutoChangeLog-pr-6306.yml deleted file mode 100644 index 2956a6f40ca2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6306.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Nomoresolvalou" -delete-after: True -changes: - - bugfix: "fixed cats not specifically defined in code displaying wrong info when held or stored in a container. This should also fix any other mob capable of being picked up that is not defined in code as well." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6307.yml b/html/changelogs/AutoChangeLog-pr-6307.yml deleted file mode 100644 index 45016fd925d6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6307.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Doubleumc" -delete-after: True -changes: - - qol: "ghost \"Scan Health\" works at any range" \ No newline at end of file diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index cb3bb1eec1ce..d3dc8490635f 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -214,3 +214,58 @@ medhud visor iloveloopers: - spellcheck: Custom rocket description now looks nicer +2024-05-20: + Doubleumc: + - qol: ghost "Scan Health" works at any range + - qol: squad/queen/leader trackers can find targets in interiors + Drathek, mullenpaul: + - ui: Finalizes the TGUI React port and brings us back into parity again with TG's + interface components + - ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an + Image component now they didn't alias the same. + - ui: VOX panel's second tab now doesn't overlap the other buttons + - ui: Wiring panel for some machines is now restored to use circular indicators + again + - ui: Smart fridge interface is more in line with sorted inventories as far as layout + & tooltips + - ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + + clicking the tab is now disabled again until the tacmap is ready (It needs + minimap subsystem to fire to have icons when flattening the map to be up to + date) + - ui: Reworks RestrictedInput number handling + - ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, + and Checkbox TGUI components (but nothing uses them yet) + - ui: 'Chat: Adds a clear chat button clearing the current tab, mute button to disable + unread notifications for a tab, and updates the word highlight regex for case + sensitivity' + - ui: Updates the ship manipulator window to allow replacing any Shuttle + - ui: Fixes the supply pod panel not displaying its byondui map correctly + - ui: Fixes the research terminal duplicating papers in display old mode. + - ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate + key handling, etc + - bugfix: Fixes thinking runtimes when quickly switching between tgsay categories + - code_imp: Shuttle subsystem now is less aggressive with reservations (skipping + deletion if below a threshold, delaying reservation if above a threshold) + - bugfix: Fixes F5 key still refreshing a TGUI window even if default was set to + be prevented (e.g. Hotkey interface) + Git-Nivrak: + - qol: Changed the Queen's pointing color to purple + - balance: Latejoin marines to larva ratio changed to 1:4 for the first 15 minutes, + going back to 1:2.5 afterwards. + HeresKozmos: + - mapadd: Added three new tunnels to New Varadero. + - maptweak: Adjusts placement of some existing tunnels on New Varadero. + Nomoresolvalou: + - balance: unpowered doors are now opened instantly in maintenance jack crowbar + mode instead of in three seconds. + - balance: crowbar mode can now pry doors closed when unpowered. + - bugfix: fixed cats not specifically defined in code displaying wrong info when + held or stored in a container. This should also fix any other mob capable of + being picked up that is not defined in code as well. + doganesi: + - bugfix: Fixed some oversights with custom loadout provided weapon boxes + vero5123: + - qol: Toggleable ammo counter, can now cycle between displaying every fifth or + single bullet. + - bugfix: Light attachments will no longer automatically turn on when the weapon + is equipped from suit storage