From d3eb47b5d07866bfb25e90de483aa1bcae3cf043 Mon Sep 17 00:00:00 2001 From: keronshb Date: Sat, 28 Aug 2021 23:33:54 -0400 Subject: [PATCH 01/11] Fixes VR sleeper --- code/modules/VR/vr_sleeper.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index cc59fe10ab..a5e31e595c 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -75,6 +75,9 @@ /obj/machinery/vr_sleeper/MouseDrop_T(mob/target, mob/user) if(user.lying || !iscarbon(target) || !Adjacent(target) || !user.canUseTopic(src, BE_CLOSE, TRUE, NO_TK)) return + if(occupant) + to_chat(user, "The VR Sleeper is already occupied!") + return close_machine(target) ui_interact(user) From f93722cc85b072ffaa0d5b8b11cf8d0da5f0fecf Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 1 Sep 2021 17:49:19 -0500 Subject: [PATCH 02/11] gentlemen i've done it. --- code/modules/tooltip/tooltip.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index ca1b163968..65e44cfbc6 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -137,7 +137,7 @@ Notes: /atom/movable/MouseEntered(location, control, params) . = ..() if(tooltips) - if(!QDELETED(src)) + if(!QDELETED(src) && usr.client.prefs.enable_tips) var/list/tooltip_data = get_tooltip_data() if(length(tooltip_data)) var/examine_data = tooltip_data.Join("
") From cd04aed49ed1e5b25cf4ba7ed550a1039b62ff19 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 2 Sep 2021 18:35:52 +0100 Subject: [PATCH 03/11] Update synthliz.dm --- .../mob/dead/new_player/sprite_accessories/synthliz.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm b/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm index c7cd699ec9..08897ade34 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm @@ -38,14 +38,14 @@ icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi' name = "Synthetic Lizard - Pecs Light" icon_state = "synthlizpecslight" - covered_limbs = list("Chest" = MATRIX_GREEN_BLUE) + covered_limbs = list("Chest" = MATRIX_GREEN_BLUE, "Left Arm" = MATRIX_BLUE, "Right Arm" = MATRIX_BLUE, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN) /datum/sprite_accessory/mam_body_markings/synthliz recommended_species = list("synthliz") icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi' name = "Synthetic Lizard - Plates" icon_state = "synthlizscutes" - covered_limbs = list("Chest" = MATRIX_GREEN) + covered_limbs = list("Chest" = MATRIX_GREEN, "Left Leg" = MATRIX_GREEN, "Right Leg" = MATRIX_GREEN) //Synth tails /datum/sprite_accessory/tails/mam_tails/synthliz From 04284f80254e0da743f82c35d6b4c3969c01f1d3 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 2 Sep 2021 20:11:49 +0200 Subject: [PATCH 04/11] Un-Spaces the Library and also removes some leftover snow. --- .../LavaRuins/lavaland_surface_library.dmm | 27 ++++++++----------- .../lavaland_surface_mining_site.dmm | 21 +++++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm index d1dcf9f11d..829761b042 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm @@ -64,10 +64,6 @@ /obj/item/paper/fluff/ruins/oldstation/protosing, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/buried_library) -"av" = ( -/obj/structure/bookcase/random, -/turf/open/space/basic, -/area/ruin/unpowered/buried_library) "aw" = ( /turf/open/floor/plating, /area/ruin/unpowered/buried_library) @@ -220,7 +216,6 @@ /area/ruin/unpowered/buried_library) "bq" = ( /obj/structure/mineral_door/wood, -/obj/structure/barricade/wooden/crude/snow, /turf/open/floor/wood, /area/ruin/unpowered/buried_library) "br" = ( @@ -369,7 +364,7 @@ bi aC ae aQ -aq +ah bi aq bg @@ -394,7 +389,7 @@ ae bi aM ae -aq +ah bm aq aA @@ -440,7 +435,7 @@ aa ad bi bi -av +aq aA bi aG @@ -465,7 +460,7 @@ aa ad ac as -av +aq aF aD aD @@ -550,7 +545,7 @@ aD bi ae bm -ah +aq ag br ac @@ -573,9 +568,9 @@ ae af bp bi -ah +aq bi -ah +aq bp ac ad @@ -596,9 +591,9 @@ ah ao ah az -ah +aq bi -ah +aq bi bn ao @@ -621,7 +616,7 @@ ah aA ah ao -ah +aq bi bi bl @@ -646,7 +641,7 @@ ah ao aV bi -ah +aq bp bi bm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm index b4f7fec16f..dfe6a1b335 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm @@ -53,8 +53,8 @@ /turf/open/floor/wood, /area/ruin/unpowered) "m" = ( -/obj/structure/barricade/wooden/crude/snow, /obj/structure/mineral_door/wood, +/obj/effect/decal/cleanable/trail_holder, /turf/open/floor/wood, /area/ruin/unpowered) "n" = ( @@ -68,6 +68,7 @@ /obj/machinery/light/broken{ dir = 4 }, +/obj/effect/decal/cleanable/trail_holder, /turf/open/floor/wood, /area/ruin/unpowered) "q" = ( @@ -95,6 +96,10 @@ /obj/effect/decal/cleanable/trail_holder, /turf/open/floor/wood, /area/ruin/unpowered) +"N" = ( +/obj/effect/decal/cleanable/trail_holder, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) (1,1,1) = {" i @@ -569,7 +574,7 @@ b l f f -f +s s b b @@ -595,7 +600,7 @@ b b b f -f +s p b b @@ -622,7 +627,7 @@ i b b b -f +s b b b @@ -649,7 +654,7 @@ i i i b -f +s b i i @@ -676,7 +681,7 @@ i i i b -f +s b i i @@ -703,7 +708,7 @@ i i i b -f +s b i i @@ -757,7 +762,7 @@ i i n h -n +N h n i From f84e62a278c04cc7e8ffc31c9284cdca05f0bedb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 3 Sep 2021 13:52:18 -0500 Subject: [PATCH 05/11] Automatic changelog generation for PR #15067 [ci skip] --- html/changelogs/AutoChangeLog-pr-15067.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15067.yml diff --git a/html/changelogs/AutoChangeLog-pr-15067.yml b/html/changelogs/AutoChangeLog-pr-15067.yml new file mode 100644 index 0000000000..03fb832b73 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15067.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "makes the arm/leg markings for synthetic lizards appear as an option again" From bf38b34048e1cfcecbb2c825615ed3ed2bab21d7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 3 Sep 2021 13:53:33 -0500 Subject: [PATCH 06/11] Automatic changelog generation for PR #15068 [ci skip] --- html/changelogs/AutoChangeLog-pr-15068.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15068.yml diff --git a/html/changelogs/AutoChangeLog-pr-15068.yml b/html/changelogs/AutoChangeLog-pr-15068.yml new file mode 100644 index 0000000000..ffe0b3722a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15068.yml @@ -0,0 +1,5 @@ +author: "WanderingFox95" +delete-after: True +changes: + - bugfix: "Lavaland architects don't screw up so badly anymore and do in fact not somehow leave holes through the planet surface all the way into space under their bookshelves." + - bugfix: "Snow was removed from Lavaland Ruins." From b276940619fbf9ecaaa53afaae4d48dc917fb4e6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 3 Sep 2021 13:56:22 -0500 Subject: [PATCH 07/11] Automatic changelog generation for PR #15049 [ci skip] --- html/changelogs/AutoChangeLog-pr-15049.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15049.yml diff --git a/html/changelogs/AutoChangeLog-pr-15049.yml b/html/changelogs/AutoChangeLog-pr-15049.yml new file mode 100644 index 0000000000..994db4c73a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15049.yml @@ -0,0 +1,4 @@ +author: "keronshb" +delete-after: True +changes: + - bugfix: "Fixes entering an occupied VR sleeper bug" From 1d18c24deb05e852e2c28a679275003a9853b843 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Fri, 3 Sep 2021 21:22:08 +0200 Subject: [PATCH 08/11] e --- code/controllers/subsystem/vote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 2474a6f272..1153088a91 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(vote) //get the highest number of votes var/greatest_votes = 0 var/total_votes = 0 - if(mode == "gamemode" && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) + if((mode == "gamemode" || mode == "roundtype") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) for(var/mob/dead/new_player/P in GLOB.player_list) if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey]) choices[choices[voted[P.ckey]]]-- @@ -105,7 +105,7 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/calculate_condorcet_votes(var/blackbox_text) // https://en.wikipedia.org/wiki/Schulze_method#Implementation - if((mode == "gamemode" || mode == "dynamic") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) + if((mode == "gamemode" || mode == "dynamic" || mode == "roundtype") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) for(var/mob/dead/new_player/P in GLOB.player_list) if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey]) voted -= P.ckey @@ -155,7 +155,7 @@ SUBSYSTEM_DEF(vote) for(var/choice in choices) scores_by_choice += "[choice]" scores_by_choice["[choice]"] = list() - if((mode == "gamemode" || mode == "dynamic") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) + if((mode == "gamemode" || mode == "dynamic" || mode == "roundtype") && CONFIG_GET(flag/must_be_readied_to_vote_gamemode)) for(var/mob/dead/new_player/P in GLOB.player_list) if(P.ready != PLAYER_READY_TO_PLAY && voted[P.ckey]) voted -= P.ckey From 4212c50504c5f535a1db0598c409380a2f621ef6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 4 Sep 2021 00:23:43 +0000 Subject: [PATCH 09/11] Automatic changelog compile [ci skip] --- html/changelog.html | 33 +++++++++++++--------- html/changelogs/.all_changelog.yml | 12 ++++++++ html/changelogs/AutoChangeLog-pr-15049.yml | 4 --- html/changelogs/AutoChangeLog-pr-15067.yml | 4 --- html/changelogs/AutoChangeLog-pr-15068.yml | 5 ---- html/changelogs/AutoChangeLog-pr-15072.yml | 4 --- 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15049.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15067.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15068.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15072.yml diff --git a/html/changelog.html b/html/changelog.html index f5ea6285f1..2e3c11748e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,25 @@ -->
+

04 September 2021

+

Putnam3145 updated:

+
    +
  • Might've fixed some ghost sprite oddities nobody even knew about
    • +
+

WanderingFox95 updated:

+
    +
  • Lavaland architects don't screw up so badly anymore and do in fact not somehow leave holes through the planet surface all the way into space under their bookshelves.
    • +
  • Snow was removed from Lavaland Ruins.
    • +
+

keronshb updated:

+
    +
  • Fixes entering an occupied VR sleeper bug
    • +
+

timothyteakettle updated:

+
    +
  • makes the arm/leg markings for synthetic lizards appear as an option again
    • +
+

03 September 2021

timothyteakettle updated:

    @@ -439,20 +458,6 @@
    • Updated server scripts for proper linux support
    - -

    03 July 2021

    -

    DeltaFire15 updated:

    -
      -
    • Turrets on nonlethal mode now once again shoot till the target is stamcrit as opposed to unable to use items, resolving some issues.
      • -
    -

    Putnam3145 updated:

    -
      -
    • A bunch of sleeping process() calls now either don't sleep or make sure to call a proc with waitfor set to FALSE
      • -
    -

    WanderingFox95 updated:

    -
      -
    • The axolotl ears in the .dmi file actually exist to the game now.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index bd62e1fcb0..10650233ab 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -29888,3 +29888,15 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-09-03: timothyteakettle: - bugfix: fixes losing your additional language upon changing species +2021-09-04: + Putnam3145: + - bugfix: Might've fixed some ghost sprite oddities nobody even knew about + WanderingFox95: + - bugfix: Lavaland architects don't screw up so badly anymore and do in fact not + somehow leave holes through the planet surface all the way into space under + their bookshelves. + - bugfix: Snow was removed from Lavaland Ruins. + keronshb: + - bugfix: Fixes entering an occupied VR sleeper bug + timothyteakettle: + - bugfix: makes the arm/leg markings for synthetic lizards appear as an option again diff --git a/html/changelogs/AutoChangeLog-pr-15049.yml b/html/changelogs/AutoChangeLog-pr-15049.yml deleted file mode 100644 index 994db4c73a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15049.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - bugfix: "Fixes entering an occupied VR sleeper bug" diff --git a/html/changelogs/AutoChangeLog-pr-15067.yml b/html/changelogs/AutoChangeLog-pr-15067.yml deleted file mode 100644 index 03fb832b73..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15067.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "makes the arm/leg markings for synthetic lizards appear as an option again" diff --git a/html/changelogs/AutoChangeLog-pr-15068.yml b/html/changelogs/AutoChangeLog-pr-15068.yml deleted file mode 100644 index ffe0b3722a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15068.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "WanderingFox95" -delete-after: True -changes: - - bugfix: "Lavaland architects don't screw up so badly anymore and do in fact not somehow leave holes through the planet surface all the way into space under their bookshelves." - - bugfix: "Snow was removed from Lavaland Ruins." diff --git a/html/changelogs/AutoChangeLog-pr-15072.yml b/html/changelogs/AutoChangeLog-pr-15072.yml deleted file mode 100644 index 8886aa2e96..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15072.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Might've fixed some ghost sprite oddities nobody even knew about" From 478bf3d6beac003181ae776abf13c3671e554b5b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 4 Sep 2021 18:17:12 -0500 Subject: [PATCH 10/11] Automatic changelog generation for PR #15075 [ci skip] --- html/changelogs/AutoChangeLog-pr-15075.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15075.yml diff --git a/html/changelogs/AutoChangeLog-pr-15075.yml b/html/changelogs/AutoChangeLog-pr-15075.yml new file mode 100644 index 0000000000..b07084734a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15075.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Unreadied player gamemode votes now actually get ignored (if the config for this is enabled)." From a14d0b648aef8d3f0513e4500e4af1533f294443 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 5 Sep 2021 00:26:09 +0000 Subject: [PATCH 11/11] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++------ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-15075.yml | 4 ---- 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15075.yml diff --git a/html/changelog.html b/html/changelog.html index 2e3c11748e..fbf778fca0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

05 September 2021

+

DeltaFire15 updated:

+
    +
  • Unreadied player gamemode votes now actually get ignored (if the config for this is enabled).
    • +
+

04 September 2021

Putnam3145 updated:

    @@ -452,12 +458,6 @@
  • tg based tool resprites
  • wirecutters have proper overlays
- -

04 July 2021

-

cadyn updated:

-
    -
  • Updated server scripts for proper linux support
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 10650233ab..17b7641684 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -29900,3 +29900,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Fixes entering an occupied VR sleeper bug timothyteakettle: - bugfix: makes the arm/leg markings for synthetic lizards appear as an option again +2021-09-05: + DeltaFire15: + - bugfix: Unreadied player gamemode votes now actually get ignored (if the config + for this is enabled). diff --git a/html/changelogs/AutoChangeLog-pr-15075.yml b/html/changelogs/AutoChangeLog-pr-15075.yml deleted file mode 100644 index b07084734a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15075.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Unreadied player gamemode votes now actually get ignored (if the config for this is enabled)."