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

Merge branch 'master' into saiga-ballin

Browse Source
This commit is contained in:
Hatterhat
2021-09-26 21:41:00 -05:00
committed by GitHub
parent fd6e97b935 1992bf7cfb
commit d3704b845c
8 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ruins/space.dm
+6
View File
@@ -331,6 +331,12 @@
name = "Space Diner"
description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe."
/datum/map_template/ruin/space/suspicious
id = "helterskelter"
suffix = "skelter.dmm"
name = "Helter Skelter"
description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"
//Space ruins for the station z
/datum/map_template/ruin/spacenearstation
prefix = "_maps/RandomRuins/SpaceRuinsStation/"
code/modules/instruments/instrument_data/hardcoded.dm
+4 -4
View File
@@ -7,11 +7,11 @@
instrument_flags = INSTRUMENT_LEGACY
volume_multiplier = 1 //not as loud as synth'd
/datum/instrument/hardcoded/accordian
name = "Accordian"
id = "accordian"
/datum/instrument/hardcoded/accordion
name = "Accordion"
id = "accordion"
legacy_instrument_ext = "mid"
legacy_instrument_path = "accordian"
legacy_instrument_path = "accordion"
/datum/instrument/hardcoded/bikehorn
name = "Bike Horn"
code/modules/instruments/instrument_data/organ.dm
+4 -4
View File
@@ -19,8 +19,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg')
/datum/instrument/organ/crisis_accordian
name = "Crisis Accordian"
/datum/instrument/organ/crisis_accordion
name = "Crisis Accordion"
id = "crack"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg',
@@ -34,8 +34,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg')
/datum/instrument/organ/crisis_tango_accordian
name = "Crisis Tango Accordian"
/datum/instrument/organ/crisis_tango_accordion
name = "Crisis Tango Accordion"
id = "crtango"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg',
code/modules/mob/living/living_blocking_parrying.dm
+1 -1
View File
@@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
/// Clickdelay duration post-parry if you fail to parry an attack
var/parry_failed_clickcd_duration = 0 SECONDS
/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
var/parry_failed_cooldown_duration = 0 SECONDS
var/parry_failed_cooldown_duration = 3.5 SECONDS
// Advanced
/// Flags added to return value
code/modules/mob/living/simple_animal/hostile/plaguerat.dm
+1 -1
View File
@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
if(LAZYLEN(GLOB.plague_rats) >= cap)
visible_message("<span class='warning'>[src] gnaws into its food, [cap] rats are now on the station!</span>")
return
// var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc)
new /mob/living/simple_animal/hostile/plaguerat(loc)
visible_message("<span class='notice'>[src] gnaws into its food, attracting another rat!</span>")
/mob/living/simple_animal/hostile/plaguerat/proc/exit_vents()
config/spaceRuinBlacklist.txt
+1
View File
@@ -53,3 +53,4 @@
#_maps/RandomRuins/SpaceRuins/spacehermit.dmm
#_maps/RandomRuins/SpaceRuins/advancedlab.dmm
#_maps/RandomRuins/SpaceRuins/spacediner.dmm
#_maps/RandomRuins/SpaceRuins/skelter.dmm
html/changelog.html
+13 -25
View File
@@ -50,6 +50,19 @@
-->
<div class="commit sansserif">
<h2 class="date">27 September 2021</h2>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">helter skelter actually spawns</li>
<li class="bugfix">code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used</li>
</ul>
<h2 class="date">25 September 2021</h2>
<h3 class="author">buffyuwu updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixes accordions</li>
</ul>
<h2 class="date">24 September 2021</h2>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
@@ -529,31 +542,6 @@
<li class="bugfix">Generic fires work now</li>
<li class="balance">A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful</li>
</ul>
<h2 class="date">26 July 2021</h2>
<h3 class="author">SandPoot updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">Removes a sneaky transform button on the vore panel.</li>
</ul>
<h2 class="date">24 July 2021</h2>
<h3 class="author">MrJWhit updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Replaces the northwest maint room on box with a sadness room</li>
<li class="rscadd">Replaces bar stripper room with an arcade on boxstation</li>
<li class="rscadd">Squished the west bathrooms a bit and made a room to sell things on boxstation.</li>
<li class="balance">Southeast maint hallway on box is now ziggy and zaggier.</li>
<li class="bugfix">Fixed pipes being not connected with the recent map PR for boxstation.</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">hallucination now bottoms out at 0</li>
<li class="balance">supermatter now causes only half the hallucinations</li>
</ul>
<h3 class="author">cadyn updated:</h3>
<ul class="changes bgimages16">
<li class="server">auxmos bump for dependencies.sh</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>
html/changelogs/.all_changelog.yml
+8
View File
@@ -30071,3 +30071,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2021-09-24:
zeroisthebiggay:
- balance: gremlins become shock immune
2021-09-25:
buffyuwu:
- bugfix: fixes accordions
2021-09-27:
zeroisthebiggay:
- bugfix: helter skelter actually spawns
- bugfix: 'code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning:
newmouse: variable defined but not used'