Skip to content
This repository has been archived by the owner on Sep 17, 2022. It is now read-only.

Update to latest WhiteSands #80

Draft
wants to merge 343 commits into
base: master
Choose a base branch
from

Conversation

KubeRoot
Copy link
Contributor

@KubeRoot KubeRoot commented Jun 23, 2021

About The Pull Request

Merges WS master into our codebase

Incomplete list of changes:

  • Explosions rework
  • Icemoon as mining planet disabled
  • mob_overlay_state, whatever that is
  • "Cigaretees" changes
  • "Custom Table Fix" - might've fixed tables made of exotic materials
  • Flags to make sounds play as mono when adjacent/always
  • Added a permission for ROD. Also added a verb for ROD. It's in the Fun category.
  • "Removes the 100% Free Lag button" - removes ability for admins to start sandstorms?
  • New ORM sprites, with rotation
  • Ethereals can now have underwear
  • 51mm bullets are now called 54mm...?
  • Nicotine can no longer be overdosed
  • Solar panel assemblies can now be printed
  • Overmap now generates solar_system by default - with a star in the center and other stuff in orbits
  • Added a lot of cigarettes
  • Supermatter walls
  • A bunch of vanity job variants
  • Whitesands, the planet, now has more differences in mobs

Why It's Good For The Game

We get some minor changes from what WS did, like making solar assemblies printable.

Changelog

🆑
code: Updated to latest whitesands (22.06.2021)
/:cl:

Moccha-Bee and others added 30 commits February 11, 2021 19:02
…ng area. (#752)

* Delta Maintanance.

* Minor fixes.


e

* Fixed some misplaced doors in meta rec area, plus grounding rods.


e

* Fixes misplaced lightswitch

* Revert "Fixes misplaced lightswitch"

This reverts commit c71a1640e5f771c07edbbb61627b6112c795302e.

* Revert "Revert "Fixes misplaced lightswitch""

This reverts commit fa729bad6d5632eb2f4af08ded8263e44c95f169.
* mower mows now

* lawnmower in cargo order
* Main commit

* Revert "Main commit"

This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7.

* Update TGS DMAPI

* Update TGS DMAPI

* Adds mothra wings

Wing sprites accreddited to Papaporo Paprito from Fulpstation

* Revert "Adds mothra wings"

This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4.

* Revert "Revert "Adds mothra wings""

This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f.

* Revert "Revert "Revert "Adds mothra wings"""

This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee.

* Revert "Revert "Revert "Revert "Adds mothra wings""""

This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7.

* Revert "Revert "Revert "Revert "Revert "Adds mothra wings"""""

This reverts commit e24995221d28bbf76cef40cdd6c92211f13efba9.

* that was so easy it's sus, but it tests out perfectly fine so /shrug

Co-authored-by: Whitesands-Bot <[email protected]>
* ai dorf translation

* dof

* adds in AI translation and in chat icons for all white sands races

* leg

* apparently you have to read the files you edit or summin

* hnggggh hardcoded runtime hgnhhhh
* add shuttle components to cargo crates under engineering

* money money money motherfucker

* fuck you zanos

* a capitalized letter

* more things

Co-authored-by: Shayne Fitzgerald <[email protected]>
* IPC Parts Tech

* Update mechfabricator_designs.dm
* Update dbconfig.txt

* Update TGS DMAPI

* no

* Main commit

* Revert "Main commit"

This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7.

* Update TGS DMAPI

* Update TGS DMAPI

* Adds mothra wings

Wing sprites accreddited to Papaporo Paprito from Fulpstation

* Revert "Adds mothra wings"

This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4.

* Revert "Revert "Adds mothra wings""

This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f.

* Revert "Revert "Revert "Adds mothra wings"""

This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee.

* Revert "Revert "Revert "Revert "Adds mothra wings""""

This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7.

* Main commit

* Revert "Main commit"

This reverts commit 6e6fb25c0faaee40e16ee17d95a6231e5dfe47d7.

* Update TGS DMAPI

* Update TGS DMAPI

* Adds mothra wings

Wing sprites accreddited to Papaporo Paprito from Fulpstation

* Revert "Adds mothra wings"

This reverts commit 029dacc2f977d0e63aa9656937f6ef0cfb4e11d4.

* Revert "Revert "Adds mothra wings""

This reverts commit fe51f19ed305d671ae74a3b0a56b6d62f3b12f9f.

* Revert "Revert "Revert "Adds mothra wings"""

This reverts commit 559d967b72c6e68b795f1468a227c5ecf60497ee.

* Revert "Revert "Revert "Revert "Adds mothra wings""""

This reverts commit 5820fead86d1d235bcc2fae743216f5d95fb04b7.

* Revert "Revert "Revert "Revert "Revert "Adds mothra wings"""""

This reverts commit e24995221d28bbf76cef40cdd6c92211f13efba9.

* Adds rosy and plasmafire wing variants

* Some fixes to wings

* Update sprite_accessories.dm

* new Ai screen!

* newline?

* two more wings!

Co-authored-by: WaspStation-Bot <[email protected]>
Co-authored-by: Whitesands-Bot <[email protected]>
* An Update to the Space Russian Arsenal: The AK-47

* AK-47 Update 1.1

* AK-47 v1.2: fixes bugs from 1.1

* AK-47 v1.3: Rebalanced the 74U and the 47

Co-authored-by: cml9988 <[email protected]>
Whitesands-Bot and others added 19 commits June 2, 2021 02:18
* fixed gateways

* changed Research gateway from calibrated to uncalibrated

* moved Research awaystarts back

Co-authored-by: Untrius <[email protected]>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.4.6)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* boofed up

* holy shit i sold my soul for pixel art cigarettes

* lung recession

* map linters

* improper and cleaning up

* holy shit this will literally save the game

* 13 loko mindbreaker gamer cigs

* shawty ok

* Update whitesands/code/game/objects/items/cigs_cigars.dm

Co-authored-by: AsciiSquid <[email protected]>

* Update whitesands/code/modules/uplink/uplink_items.dm

Co-authored-by: AsciiSquid <[email protected]>

* Update cigs_cigars.dm

* pipe fix

* guh

* fixed donk-co pockets, random reagents, secret sauce, and max bullet overlay

Co-authored-by: scar <[email protected]>
Co-authored-by: scar <[email protected]>
Co-authored-by: AsciiSquid <[email protected]>
Co-authored-by: Untrius <[email protected]>
Co-authored-by: Whitesands-Bot <[email protected]>
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@MaltVinegar
Copy link
Member

When the merge conflict is sus

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.