Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatability with sawmills. #60

Merged
merged 1 commit into from
Apr 19, 2018
Merged

Compatability with sawmills. #60

merged 1 commit into from
Apr 19, 2018

Conversation

PJB3005
Copy link
Member

@PJB3005 PJB3005 commented Apr 19, 2018

Can be merged immediately, since sawmills kept Logger.Info untouched.

@ghost ghost assigned PJB3005 Apr 19, 2018
@ghost ghost added review labels Apr 19, 2018
@PJB3005 PJB3005 removed the review label Apr 19, 2018
@PJB3005 PJB3005 merged commit 74193d1 into space-wizards:master Apr 19, 2018
@ghost ghost removed the W: In Progress label Apr 19, 2018
@PJB3005 PJB3005 deleted the 18-04-19-sawmills branch April 19, 2018 18:23
rbertoche referenced this pull request in rbertoche/space-station-14 Oct 1, 2022
@Elijahrane
Advanced mop (#60)
abd1917
Morb0 pushed a commit to Morb0/space-station-14 that referenced this pull request Oct 30, 2022
@SS14-RU
add: Переводы от Lekar, ga (space-wizards#60)
996e22a
CaptainSqrBeard pushed a commit to CaptainSqrBeard/space-station-14 that referenced this pull request Feb 24, 2023
@Desoth
Update human.yml (space-wizards#60)
e007d22
moonheart08 pushed a commit to moonheart08/space-station-14 that referenced this pull request Mar 16, 2023
@silicons-bot @778b @lunar-crater-ex
[MIRROR] Solved bug with wrong rotation of APC on Cluster (space-wiza…
d6d75e9 
…rds#60)

* Solved bug with wrong rotation of APC on Cluster (space-wizards#13245)

Closes space-wizards#13230

* Solved bug with wrong rotation of APC on Cluster

Co-authored-by: 778b <[email protected]>
Co-authored-by: lunar-crater-ex <[email protected]>
moonheart08 pushed a commit to moonheart08/space-station-14 that referenced this pull request Mar 16, 2023
@silicons-bot @778b @lunar-crater-ex
[MIRROR] Solved bug with wrong rotation of APC on Cluster (space-wiza…
84f1d86 
…rds#60)

* Solved bug with wrong rotation of APC on Cluster (space-wizards#13245)

Closes space-wizards#13230

* Solved bug with wrong rotation of APC on Cluster

Co-authored-by: 778b <[email protected]>
Co-authored-by: lunar-crater-ex <[email protected]>
rbertoche referenced this pull request in rbertoche/space-station-14 Mar 31, 2023
@DEATHB4DEFEAT
fix changelog again (#60)
a68b9e4 
<!-- The text between the arrows are comments - they will not be visible
on your PR. -->

# About the PR
<!-- Describe the Pull Request here. What does it change? What other
things could this impact? -->


# Media
<!--
If applicable, add screenshots or videos to showcase your PR. Small
fixes/refactors are exempt, but all PRs which make ingame changes
(adding clothing, items, new features, etc) must include ingame media or
the PR will not be merged.
This makes it much easier for us to merge PRs and find media for
progress reports. If you include media in your pull request, we
may potentially use it in the progress reports, with clear credit given.

Use screenshot software like Window's built in snipping tool, ShareX,
Lightshot, or recording software like ShareX (gif), ScreenToGif, or Open
Broadcaster Software (cross platform).
If you're unsure whether your PR will require media, ask a maintainer.
-->


# Changelog
<!--
Here you can fill out a changelog that will automatically be added to
the game when your PR is merged
There are 4 icons for changelog entries: add, remove, tweak, fix. I
trust you can figure out the rest.

You can put your name after the 🆑 symbol to change the name that
shows in the changelog (otherwise it takes your GitHub username)
Like so: 🆑 PJB

Generally, only put things in changelogs that players actually care
about. Stuff like "Refactored X system, no changes should be visible"
shouldn't be on a changelog.

For writing actual entries, don't consider the entry type suffix (e.g.
add) to be "part" of the sentence:
bad: - add: a new tool for engineers
good: - add: added a new tool for engineers
-->

🆑
- add: Added fun!
- tweak: Tweaked fun!
- fix: Fixed fun!
- remove: Removed fun!
Just-a-Unity-Dev added a commit to Just-a-Unity-Dev/space-station-14 that referenced this pull request Jul 14, 2023
@Just-a-Unity-Dev
funnier FTL warp (space-wizards#60)
5b5111e
rbertoche referenced this pull request in rbertoche/space-station-14 Jul 29, 2023
@Cheackraze
Merge pull request #60 from new-frontiers-14/cherrypick_july
0777861 
Little cherry pick for some fun stuff early in july
rbertoche referenced this pull request in rbertoche/space-station-14 Oct 21, 2023
@DebugOk
Update audio.yml (#60)
12803ae
Nimfar11 pushed a commit to Nimfar11/space-station-14 that referenced this pull request Apr 14, 2024
@TheShuEd
Новый стиль UI, под новые слоты. (space-wizards#60)
bc7fa29 
* reskin

* storage skin
deltanedas pushed a commit to deltanedas/space-station-14 that referenced this pull request May 4, 2024
@ps3moira
Merge pull request space-wizards#60 from greystation14/Revert-Auto-Ch…
c01ed1f 
…angelog

Revert Auto Changelog
SlamBamActionman pushed a commit to SlamBamActionman/space-station-14 that referenced this pull request Jul 5, 2024
@TsjipTsjip @Aexxie
adds clouds and duck poster (by kezu) (space-wizards#60)
c5047a2 
* adds clouds and duck poster (by kezu)

* Make Umbra posters parent off of PosterBase entirely.

---------

Co-authored-by: Aexxie <[email protected]>
wafehling referenced this pull request in wafehling/space-station-14-Chemfix Aug 15, 2024
@medabunny
Merge pull request #60 from AirFryerBuyOneGetOneFree/master
b15d375 
Revert Low Pressure (Spacing) Damage to Original Value
Unisol pushed a commit to Unisol/ss14 that referenced this pull request Sep 25, 2024
@KeldWolf
Merge pull request space-wizards#60 from ss14-harmony/spanky-omega
c077521 
Second round of Omega changes.
spiffycodes pushed a commit to spiffycodes/space-station-14 that referenced this pull request Oct 5, 2024
@Doctor-Cpu
Vent crawling (space-wizards#60)
a80c233 
* pipe crawling verb

* world interact

* get the connected pipes

* check player movement

* remove unused collision

* fix gas pumps

* fix trinary gas

* woops

* use different move event

* tile movement

* fix stuttering

* allow continuous keypresses

* move direction is based of keys pressed

* make player face direction of the pipe

* breathing content of the pipe

* only allow selected entities

* hide sprite in a pipe

* fix exiting vents

* transfer pressure and temp

* fix moving in crit
Doctor-Cpu added a commit to Doctor-Cpu/space-station-14 that referenced this pull request Nov 3, 2024
@Doctor-Cpu
Revert "Vent crawling (space-wizards#60)" (space-wizards#77)
576fcb3 
This reverts commit a80c233.
Doctor-Cpu added a commit to Doctor-Cpu/space-station-14 that referenced this pull request Nov 3, 2024
@Doctor-Cpu
Pipe fix (space-wizards#78)
cda5308 
* Reapply "Vent crawling (space-wizards#60)" (space-wizards#77)

This reverts commit 576fcb3.

* Reapply "disable pipe crawling when welded (space-wizards#75)" (space-wizards#76)

This reverts commit 9750674.

* prevent anyone entering pipes

* prevent stuttering

* prevent swapping pipes

* make pipe crawling a container

* fix teleporting randomly

* refactor verb

* make pipe deletion more robust

* fix exiting pipes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZoldorfTheWizard ZoldorfTheWizard Awaiting requested review from ZoldorfTheWizard

Assignees

@PJB3005 PJB3005

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@PJB3005