cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into luciee

Browse Source
This commit is contained in:
Katherine Kiefer
2022-07-19 13:08:05 +10:00
parent 87bd779a47 dd157f698f
commit 19fb4b26b8
7 changed files with 75 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm
View File

@@ -160,18 +160,6 @@
},
/turf/open/floor/plasteel/stairs/goon/stairs_middle,
/area/ruin/powered/fishing)
"fG" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
/obj/item/reagent_containers/glass/mixbowl{
pixel_x = 1;
pixel_y = 4
},
/obj/item/reagent_containers/food/condiment/enzyme{
layer = 5
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"fI" = (
/obj/effect/turf_decal/pool,
/turf/open/floor/wood{
@@ -308,19 +296,6 @@
"jO" = (
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"kZ" = (
/obj/machinery/button/door{
id = "fishing lockdown";
name = "Lockdown Control";
pixel_x = -23;
pixel_y = 1;
req_access_txt = "19"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/powered/fishing)
"lg" = (
/obj/machinery/vending/dinnerware,
/obj/effect/decal/cleanable/dirt/dust,
@@ -573,6 +548,13 @@
},
/turf/open/water/safe,
/area/ruin/powered/fishing)
"xb" = (
/obj/structure/closet/secure_closet/freezer/fridge{
req_access = "Fisherman"
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"ys" = (
/obj/machinery/door/airlock/wood{
name = "bunk room";
@@ -610,6 +592,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"zd" = (
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = "Fisherman"
},
/obj/item/reagent_containers/glass/mixbowl{
pixel_x = 1;
pixel_y = 4
},
/obj/item/reagent_containers/food/condiment/enzyme{
layer = 5
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"zk" = (
/obj/effect/turf_decal/pool{
dir = 8
@@ -647,6 +643,19 @@
/obj/machinery/vending/autodrobe,
/turf/open/floor/plasteel,
/area/ruin/powered/fishing)
"By" = (
/obj/machinery/button/door{
id = "fishing lockdown";
name = "Lockdown Control";
pixel_x = -23;
pixel_y = 1;
req_access_txt = "Fisherman"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/powered/fishing)
"BV" = (
/obj/machinery/light{
dir = 8
@@ -757,11 +766,6 @@
},
/turf/open/floor/wood,
/area/ruin/powered/fishing)
"Eo" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ruin/powered/fishing)
"Fb" = (
/obj/structure/railing{
dir = 8
@@ -1759,7 +1763,7 @@ SQ
Jt
JL
UO
fG
zd
JL
aa
"}
@@ -1791,7 +1795,7 @@ XA
gt
OQ
UO
Eo
xb
JL
aa
"}
@@ -2014,7 +2018,7 @@ sI
CI
HX
HX
kZ
By
WS
JL
US

4
code/datums/mapgen/Cavegens/IcemoonCaves.dm
View File

@@ -5,7 +5,9 @@
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \
/mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
/mob/living/simple_animal/hostile/asteroid/marrowweaver/ice = 30,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6)
///Note that this spawn list is also in the lavaland generator
feature_spawn_list = list()

1
code/datums/mapgen/Cavegens/LavalandGenerator.dm
View File

@@ -6,6 +6,7 @@
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \
/mob/living/simple_animal/hostile/asteroid/marrowweaver = 30,
SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10
)
flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)

2
code/game/gamemodes/eldritch_cult/eldritch_cult.dm
View File

@@ -6,7 +6,7 @@
false_report_weight = 5
protected_jobs = list("Chaplain","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician
restricted_jobs = list("AI", "Cyborg")
required_players = 35
required_players = 25
required_enemies = 1
recommended_enemies = 4
reroll_friendly = 1

31
html/changelog.html
View File

@@ -58,6 +58,27 @@
-->
<div class="commit sansserif">
<h2 class="date">18 July 2022</h2>
<h3 class="author">N3D6 updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">heretic player count lowered to 25 from 35</li>
</ul>
<h3 class="author">ToasterBiome updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Marrow Weaver readded to lavaland</li>
</ul>
<h3 class="author">VaelophisNyx updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixes fishing biodome lockdown and fridge access</li>
</ul>
<h3 class="author">nmajask updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">adds an organ fridge to the meta medbay</li>
<li class="tweak">wires the meta medbay treatment center,</li>
<li class="tweak">adds some firelocks to meta medbay</li>
<li class="tweak">fixed the cooler in meta medbay</li>
</ul>
<h2 class="date">17 July 2022</h2>
<h3 class="author">JamieD1 updated:</h3>
<ul class="changes bgimages16">
@@ -2551,16 +2572,6 @@
<ul class="changes bgimages16">
<li class="imageadd">pipebomb dmi tweak</li>
</ul>
<h2 class="date">18 April 2022</h2>
<h3 class="author">Chubbygummibear updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Podpeople feeding off light toned down. You feed a decent amount off light, but not so much you're fat. So pods can actually eat a bit now without incurring obesity.</li>
</ul>
<h3 class="author">adamsong updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixed only non-admins being asked to reboot the server on ticket resolution</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>

12
html/changelogs/.all_changelog.yml
View File

@@ -32810,3 +32810,15 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
redmoogle:
- bugfix: Unobserve button doesnt duplicate now
- bugfix: Fixing a robotic limb no longer displays tool name
2022-07-18:
N3D6:
- tweak: heretic player count lowered to 25 from 35
ToasterBiome:
- bugfix: Marrow Weaver readded to lavaland
VaelophisNyx:
- bugfix: Fixes fishing biodome lockdown and fridge access
nmajask:
- tweak: adds an organ fridge to the meta medbay
- tweak: wires the meta medbay treatment center,
- tweak: adds some firelocks to meta medbay
- tweak: fixed the cooler in meta medbay

7
html/changelogs/AutoChangelog-pr-14889.yml
View File

@@ -1,7 +0,0 @@
author: "nmajask"
delete-after: true
changes:
- tweak: "adds an organ fridge to the meta medbay"
- tweak: "wires the meta medbay treatment center,"
- tweak: "adds some firelocks to meta medbay"
- tweak: "fixed the cooler in meta medbay"