cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

Browse Source 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-02-23 20:32:44 -05:00
parent 4457c2ffd2 63667c4a02
commit 30454ccdc3
138 changed files with 2790 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/changelog.html
+43
View File
@@ -53,6 +53,49 @@
-->
<div class="commit sansserif">
<h2 class="date">22 February 2018</h2>
<h3 class="author">Anewbe updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added Warden and HoS helmets.</li>
<li class="tweak">Clothing items must be click+dragged to be unequipped. A lot of them already had this, but the system is now standardized.</li>
<li class="tweak">Accessories now apply slowdown to what they're attached to.</li>
<li class="tweak">Certain items, notably Technomancer spells, no longer show up when you examine the mob wearing them.</li>
<li class="tweak">Flashbangs confuse, instead of stunning.</li>
</ul>
<h3 class="author">Atermonera updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">GPS units are generally more useful, providing both coordinate locations and, so long as you're on the same Z level, direction with x-y component distances, to 1m accuracy</li>
<li class="rscadd">Added a halogen counter tool, functions as the PDA function.</li>
<li class="tweak">Analyzers can now analyze gas containers, in addition to providing atmosphere readouts, as the PDA gas scanner function.</li>
<li class="rscadd">Added umbrellas.</li>
</ul>
<h3 class="author">battlefieldCommander updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added fireplaces which operate similarly to bonfires.</li>
<li class="bugfix">Fixed an oversight that allowed for an in-between state in bonfires where the fire would mysteriously go out after adding wood.</li>
<li class="rscadd">Added blue sifwood floor tiles.</li>
<li class="bugfix">Fixed blue carpet, now known as teal carpet</li>
<li class="rscadd">Added the ability to dig up tree stumps with a shovel.</li>
</ul>
<h2 class="date">21 February 2018</h2>
<h3 class="author">Anewbe updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Headsets for jobs that spend a lot of time planetside can now function as local radios when comms are down.</li>
<li class="rscadd">Most headsets now have on-mob sprites.</li>
<li class="rscadd">Added a Planetside Gun Permit item, specifying permission to possess a firearm on the planet's surface. Explorers should spawn with these by default, and a further two can be found in their gun locker.</li>
<li class="rscadd">Prometheans now react to water. Being soaked will stop their regen and deal minor toxin damage. Drinking or being injected with water will deal slightly more toxin damage.</li>
<li class="bugfix">Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead.</li>
</ul>
<h3 class="author">Leshana updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Makes electrochromatic glass buildable and programmable in game. Use cable and multitool.</li>
</ul>
<h3 class="author">Woodrat updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Additions of 6 new POIs for the cave area.</li>
</ul>
<h2 class="date">17 February 2018</h2>
<h3 class="author">Anewbe updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+42
View File
@@ -3900,3 +3900,45 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Added packed snow brick material. Craft it using snow piles.
- recadd: Added snow girders and igloo walls. Craft them using snow bricks.
- rscadd: Added various snowmen. Craft them using snow piles. Punch 'em to destroy.
2018-02-21:
Anewbe:
- rscadd: Headsets for jobs that spend a lot of time planetside can now function
as local radios when comms are down.
- rscadd: Most headsets now have on-mob sprites.
- rscadd: Added a Planetside Gun Permit item, specifying permission to possess a
firearm on the planet's surface. Explorers should spawn with these by default,
and a further two can be found in their gun locker.
- rscadd: Prometheans now react to water. Being soaked will stop their regen and
deal minor toxin damage. Drinking or being injected with water will deal slightly
more toxin damage.
- bugfix: Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets
too hot for your suit, you're still dead.
Leshana:
- rscadd: Makes electrochromatic glass buildable and programmable in game. Use
cable and multitool.
Woodrat:
- rscadd: Additions of 6 new POIs for the cave area.
2018-02-22:
Anewbe:
- rscadd: Added Warden and HoS helmets.
- tweak: Clothing items must be click+dragged to be unequipped. A lot of them already
had this, but the system is now standardized.
- tweak: Accessories now apply slowdown to what they're attached to.
- tweak: Certain items, notably Technomancer spells, no longer show up when you
examine the mob wearing them.
- tweak: Flashbangs confuse, instead of stunning.
Atermonera:
- tweak: GPS units are generally more useful, providing both coordinate locations
and, so long as you're on the same Z level, direction with x-y component distances,
to 1m accuracy
- rscadd: Added a halogen counter tool, functions as the PDA function.
- tweak: Analyzers can now analyze gas containers, in addition to providing atmosphere
readouts, as the PDA gas scanner function.
- rscadd: Added umbrellas.
battlefieldCommander:
- rscadd: Added fireplaces which operate similarly to bonfires.
- bugfix: Fixed an oversight that allowed for an in-between state in bonfires where
the fire would mysteriously go out after adding wood.
- rscadd: Added blue sifwood floor tiles.
- bugfix: Fixed blue carpet, now known as teal carpet
- rscadd: Added the ability to dig up tree stumps with a shovel.
html/changelogs/Anewbe - Suit Coolers.yml
-36
View File
@@ -1,36 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Anewbe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead."
html/changelogs/Leshana - tesla-grounding.yml
+4
View File
@@ -0,0 +1,4 @@
author: Leshana
delete-after: True
changes:
- tweak: "Grounding rods act intuitively, only having an expanded lighting catch area when anchored."