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

Ports Parkstation Arborum #68

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

Ports Parkstation Arborum #68

wants to merge 2 commits into from

Conversation

Pspritechologist
Copy link
Member

  • Brig access doesn't seem to work
  • Wires in hall needs to be moved
  • Paper in Sec needs to be stamped
  • Map needs to be resaved

Media later maybe.

@Pspritechologist
I believe this is the Parkstation map fully ported with all* required…
e47156c 
… Entities. Some small touched required are left below. The map file is a mess due to my manual de-fucking of it.

Brig access doesn't seem to work
Wires in hall needs to be moved
Paper in Sec needs to be stamped
Map needs to be resaved
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 4, 2024
@github-actions GitHub Actions

This comment was marked as off-topic.

Sign in to view
@github-actions github-actions bot added Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi labels Jun 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 4, 2024 •
edited
Loading

RSI Diff Bot; head commit 5183c0c merging into c0cdfd5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SimpleStation14/Objects/Consumable/Drinks/jug.rsi

State Old New Status
empty Added
full Added
icon Added

Resources/Textures/SimpleStation14/Objects/Devices/pinpointer.rsi

State Old New Status
inhand-left Added
inhand-right Added
pinonclose Added
pinondirect Added
pinonfar Added
pinonmedium Added
pinonnull Added
pinpointer_anomaly Added
pinpointer_artifact Added

Resources/Textures/SimpleStation14/Objects/Fun/toys.rsi

State Old New Status
mcgriff Added

Resources/Textures/SimpleStation14/Objects/Misc/books.rsi

State Old New Status
book_anomalies Added
book_psionics Added

Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/k12mini.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
midback Added

Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi

State Old New Status
base Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mag-unshaded-5 Added
mag-unshaded-6 Added
mag-unshaded-7 Added
mag-unshaded-8 Added
mag-unshaded-9 Added

Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Projectiles/projectiles.rsi

State Old New Status
beam Added
impact_laser Added
muzzle_laser Added

Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/k12compact.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added

Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi

State Old New Status
base Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mag-unshaded-5 Added
mag-unshaded-6 Added
mag-unshaded-7 Added
mag-unshaded-8 Added
mag-unshaded-9 Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/atmospherics.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/command.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/engineering.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/medical.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/salvage.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/science.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/security.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/paintings.rsi

State Old New Status
painting2 Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/posters.rsi

State Old New Status
parkstationmap Added
poster1_parlour Added
poster2_parlour Added
poster3_parlour Added
poster4_parlour Added
poster5_parlour Added
poster6_parlour Added
poster7_parlour Added

Edit: diff updated after 5183c0c

Pspritechologist pushed a commit that referenced this pull request Jun 4, 2024
@SimpleStation14 @DangerRevolution
Adds Lunchboxes to Lockers (#68)
6c4c179 
## Mirror of PR #989: [Adds Lunchboxes to
Lockers](DeltaV-Station/Delta-v#989) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/142105406?v=4"
width="16"/><a href="https://github.com/DangerRevolution">
DangerRevolution</a> at 2024-03-21 17:52:42 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/142105406?v=4"
width="16"/><a href="https://github.com/DangerRevolution">
DangerRevolution</a> at 2024-03-21 18:46:44 UTC</aside>
<sup>

`d07fa88e1dfba6107602c9cf0d58733ed6074274`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> 
> Title.
> 
> **Changelog**
> :cl: DangerRevolution
> - add: Added lunchboxes to various staff lockers
> 


</details>

Co-authored-by: Danger Revolution! <[email protected]>
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 4, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Jun 24, 2024
Open
75 tasks
@SpaceCowboyServer SpaceCowboyServer mentioned this pull request Aug 15, 2024
Closed
2 tasks
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT will be requested when the pull request is marked ready for review DEATHB4DEFEAT is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@DEATHB4DEFEAT DEATHB4DEFEAT

Labels
Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Pspritechologist @DEATHB4DEFEAT