shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
keronshb
2021-09-05 13:31:05 -04:00
parent 6b6034d34d a14d0b648a
commit dfdc4b5c02
9 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm
+11 -16
View File
@@ -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
_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm
+13 -8
View File
@@ -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
code/controllers/subsystem/vote.dm
+3 -3
View File
@@ -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
code/modules/VR/vr_sleeper.dm
+3
View File
@@ -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, "<span class='boldnotice'>The VR Sleeper is already occupied!</span>")
return
close_machine(target)
ui_interact(user)
code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm
+2 -2
View File
@@ -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
code/modules/tooltip/tooltip.dm
+1 -1
View File
@@ -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("<br />")
html/changelog.html
+25 -20
View File
@@ -50,6 +50,31 @@
-->
<div class="commit sansserif">
<h2 class="date">05 September 2021</h2>
<h3 class="author">DeltaFire15 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Unreadied player gamemode votes now actually get ignored (if the config for this is enabled).</li>
</ul>
<h2 class="date">04 September 2021</h2>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Might've fixed some ghost sprite oddities nobody even knew about</li>
</ul>
<h3 class="author">WanderingFox95 updated:</h3>
<ul class="changes bgimages16">
<li class="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.</li>
<li class="bugfix">Snow was removed from Lavaland Ruins.</li>
</ul>
<h3 class="author">keronshb updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixes entering an occupied VR sleeper bug</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">makes the arm/leg markings for synthetic lizards appear as an option again</li>
</ul>
<h2 class="date">03 September 2021</h2>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
@@ -433,26 +458,6 @@
<li class="imageadd">tg based tool resprites</li>
<li class="bugfix">wirecutters have proper overlays</li>
</ul>
<h2 class="date">04 July 2021</h2>
<h3 class="author">cadyn updated:</h3>
<ul class="changes bgimages16">
<li class="server">Updated server scripts for proper linux support</li>
</ul>
<h2 class="date">03 July 2021</h2>
<h3 class="author">DeltaFire15 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Turrets on nonlethal mode now once again shoot till the target is stamcrit as opposed to unable to use items, resolving some issues.</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">A bunch of sleeping process() calls now either don't sleep or make sure to call a proc with waitfor set to FALSE</li>
</ul>
<h3 class="author">WanderingFox95 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">The axolotl ears in the .dmi file actually exist to the game now.</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>
html/changelogs/.all_changelog.yml
+16
View File
@@ -29888,3 +29888,19 @@ 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
2021-09-05:
DeltaFire15:
- bugfix: Unreadied player gamemode votes now actually get ignored (if the config
for this is enabled).
html/changelogs/AutoChangeLog-pr-15072.yml
-4
View File
@@ -1,4 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- bugfix: "Might've fixed some ghost sprite oddities nobody even knew about"