Ports Parkstation Arborum #68

Pspritechologist · 2024-06-04T08:25:37Z

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.

github-actions · 2024-06-04T08:26:23Z

RSI Diff Bot; head commit 7104f9f merging into a9cf0fc
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 7104f9f

## 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 · 2024-08-20T00:27:23Z

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

DEATHB4DEFEAT · 2024-12-20T04:48:06Z

Resources/Prototypes/Parkstation/Entities/Objects/Devices/pinpointer.yml

+- type: entity
+  name: anomaly tracker
+  id: PinpointerAnomaly
+  parent: PinpointerBase
+  components:
+  - type: Pinpointer
+    component: Anomaly
+    mediumDistance: 24
+    closeDistance: 12
+    reachedDistance: 5
+    precision: 0.2
+  - type: Sprite
+    sprite: SimpleStation14/Objects/Devices/pinpointer.rsi
+    layers:
+    - state: pinpointer_anomaly
+      map: ["enum.PinpointerLayers.Base"]
+    - state: pinonnull
+      map: ["enum.PinpointerLayers.Screen"]


There is an anomaly tracker now with a cool sprite, but I don't think it tells you where it is, just beeps faster and faster when near.

DEATHB4DEFEAT · 2024-12-20T04:50:14Z

Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

+  description: Standard issue Nanotrasen laser SMG. Pew! Pew pew! Now we're talkin' scifi!
+  components:
+  - type: Item
+    size: 28


Needs a new size and/or shape

DEATHB4DEFEAT · 2024-12-20T04:51:44Z

Resources/Textures/Parkstation/Structures/Doors/Airlocks/External/service.rsi/meta.json

@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Modified by Pspritechologist from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",


I don't think you did in this PR

… 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 bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 4, 2024

This comment was marked as off-topic.

Sign in to view

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 bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 4, 2024

Pspritechologist assigned DEATHB4DEFEAT Jun 4, 2024

DEATHB4DEFEAT mentioned this pull request Jun 24, 2024

List of Things to Rebase #2

Open

75 tasks

SpaceCowboyServer mentioned this pull request Aug 15, 2024

Parkstation map SpaceStationUA/station#40

Closed

2 tasks

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 20, 2024

github-actions bot added Changes: YML Changes any yml files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Dec 10, 2024

DEATHB4DEFEAT reviewed Dec 20, 2024

View reviewed changes

github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: UI Changes any XAML files Changes: Config Changes any configuration file Changes: Audio Changes any ogg files labels Dec 21, 2024

Pspritechologist force-pushed the parkstation branch from 0ee0a46 to 44c55c2 Compare December 21, 2024 16:57

Pspritechologist removed Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: UI Changes any XAML files Changes: Config Changes any configuration file Changes: Audio Changes any ogg files labels Dec 21, 2024

Pspritechologist and others added 2 commits December 21, 2024 15:31

some review changes

fc88b42

Several changes to Parkstation and fought God.

c1817d5

Pspritechologist force-pushed the parkstation branch from 2b92d9f to c1817d5 Compare December 21, 2024 20:38

Redid an old fix that was broken due to rebase bungling

7104f9f

Pspritechologist marked this pull request as ready for review December 21, 2024 20:56

Pspritechologist merged commit 400b31a into master Dec 21, 2024
19 of 21 checks passed

Pspritechologist deleted the parkstation branch December 21, 2024 20:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ports Parkstation Arborum #68

Ports Parkstation Arborum #68

Pspritechologist commented Jun 4, 2024

This comment was marked as off-topic.

github-actions bot commented Jun 4, 2024 •

edited

Loading

github-actions bot commented Aug 20, 2024

DEATHB4DEFEAT Dec 20, 2024

DEATHB4DEFEAT Dec 20, 2024

DEATHB4DEFEAT Dec 20, 2024

Ports Parkstation Arborum #68

Ports Parkstation Arborum #68

Conversation

Pspritechologist commented Jun 4, 2024

This comment was marked as off-topic.

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

github-actions bot commented Aug 20, 2024

DEATHB4DEFEAT Dec 20, 2024

Choose a reason for hiding this comment

DEATHB4DEFEAT Dec 20, 2024

Choose a reason for hiding this comment

DEATHB4DEFEAT Dec 20, 2024

Choose a reason for hiding this comment

github-actions bot commented Jun 4, 2024 •

edited

Loading