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
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
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)
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
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("
")
diff --git a/html/changelog.html b/html/changelog.html
index f5ea6285f1..fbf778fca0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,31 @@
-->
+
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:
+
+ - 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:
@@ -433,26 +458,6 @@
- tg based tool resprites
- wirecutters have proper overlays
-
-
04 July 2021
-
cadyn updated:
-
- - 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.
-