Skip to content

Commit

Permalink
Merge pull request #1251 from DinnerCalzone/bird-station
Browse files Browse the repository at this point in the history
Hummingbird update, evil skull thief objective, make Fin-Fin steal objective check if he exists
  • Loading branch information
hivehum authored Jan 8, 2025
2 parents a6c4b64 + 0dbc289 commit 2a9e11e
Show file tree
Hide file tree
Showing 7 changed files with 191 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ steal-target-groups-shipyardcomputercircuitboard = shipyard computer board
steal-target-groups-commscomputercircuitboard = communications computer board
steal-target-groups-secpillcanister = head of security's pill canister
steal-target-groups-evil-skull = evil skull
# Thief Animal

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# this is so scuffed im so fucking sorry
objective-condition-thief-generator-description = If the station needed this generator, they should have used it! Now it'll be mine...!
objective-condition-thief-cigarettes = THUI TEK NEW PORTS
objective-condition-thief-evil-skull-description = From what I hear, the chaplain keeps it in the chapel morgue... It's as good as mine!
objective-condition-thief-multiply-structure-description = I need to get {$count} parts of the {$itemName} and take them with me.
158 changes: 98 additions & 60 deletions Resources/Maps/_Impstation/hummingbird.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3258,6 +3258,9 @@ entities:
3718: 67,0
4259: 67,1
4789: 111,-16
5203: 85,-47
5204: 85,-48
5205: 85,-49
- node:
color: '#F00000FF'
id: WarnLineW
Expand Down Expand Up @@ -5328,7 +5331,8 @@ entities:
22,11:
1: 62207
22,12:
1: 61695
1: 61693
9: 2
23,9:
1: 4368
8: 52416
Expand Down Expand Up @@ -6311,6 +6315,21 @@ entities:
- 0
- 0
- 0
- volume: 2500
temperature: 293.15
moles:
- 21.823984
- 82.09976
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
Expand Down Expand Up @@ -58982,43 +59001,67 @@ entities:
- uid: 9639
components:
- type: Transform
anchored: False
pos: 11.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9640
components:
- type: Transform
anchored: False
pos: 13.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9641
components:
- type: Transform
anchored: False
pos: 14.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9642
components:
- type: Transform
anchored: False
pos: 9.5,9.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9643
components:
- type: Transform
anchored: False
pos: 8.5,9.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9644
components:
- type: Transform
anchored: False
pos: 8.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9645
components:
- type: Transform
anchored: False
pos: 9.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- uid: 9646
components:
- type: Transform
anchored: False
pos: 12.5,8.5
parent: 2
- type: Physics
bodyType: Dynamic
- proto: ContrabassInstrument
entities:
- uid: 9647
Expand Down Expand Up @@ -60377,7 +60420,6 @@ entities:
- uid: 9854
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 86.5,-31.5
parent: 2
- uid: 9855
Expand Down Expand Up @@ -67815,6 +67857,15 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: EvilSkullArtifactItem
entities:
- uid: 16489
components:
- type: Transform
parent: 16488
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: ExosuitFabricator
entities:
- uid: 11066
Expand Down Expand Up @@ -75468,23 +75519,6 @@ entities:
- type: Transform
pos: 104.528625,49.596867
parent: 2
- proto: FlippoEngravedLighter
entities:
- uid: 11775
components:
- type: Transform
pos: 108.304375,-19.19907
parent: 2
- uid: 11776
components:
- type: Transform
pos: 128.58989,-18.799398
parent: 2
- uid: 11777
components:
- type: Transform
pos: 143.19699,3.705914
parent: 2
- proto: FlippoLighter
entities:
- uid: 11778
Expand Down Expand Up @@ -110146,35 +110180,6 @@ entities:
- type: Transform
pos: 6.5989666,-6.4250817
parent: 2
- proto: HeadSkeleton
entities:
- uid: 16489
components:
- type: MetaData
desc: Beware.
name: evil skull
- type: Transform
parent: 16488
- type: Physics
canCollide: False
- type: WarpPoint
location: Evil Skull
- type: PointLight
energy: 5
color: '#FF0000FF'
radius: 1.3
- type: Artifact
activationSound: !type:SoundPathSpecifier
params:
variation: 0.1
volume: 3
path: /Audio/Voice/Skeleton/skeleton_scream.ogg
nodesMax: 13
nodesMin: 5
nodeTree: []
- type: InsideEntityStorage
missingComponents:
- Gibbable
- proto: HeatExchanger
entities:
- uid: 16490
Expand Down Expand Up @@ -113466,8 +113471,8 @@ entities:
immutable: False
temperature: 293.14673
moles:
- 1.8968438
- 7.1357465
- 1.8977377
- 7.139109
- 0
- 0
- 0
Expand Down Expand Up @@ -128757,8 +128762,11 @@ entities:
- uid: 19523
components:
- type: Transform
anchored: False
pos: 14.5,6.5
parent: 2
- type: Physics
bodyType: Dynamic
- proto: Sink
entities:
- uid: 19524
Expand Down Expand Up @@ -130961,15 +130969,45 @@ entities:
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 16641
components:
- type: Transform
pos: 44.5,-57.5
parent: 2
- uid: 19912
components:
- type: Transform
pos: 87.5,-31.5
pos: 44.5,-59.5
parent: 2
- uid: 19913
- uid: 24117
components:
- type: Transform
pos: 86.5,-31.5
pos: 44.5,-53.5
parent: 2
- uid: 24309
components:
- type: Transform
pos: 60.5,-56.5
parent: 2
- uid: 24310
components:
- type: Transform
pos: 60.5,-54.5
parent: 2
- uid: 24311
components:
- type: Transform
pos: 60.5,-51.5
parent: 2
- uid: 24312
components:
- type: Transform
pos: 60.5,-59.5
parent: 2
- uid: 24313
components:
- type: Transform
pos: 44.5,-51.5
parent: 2
- proto: SpawnPointLawyer
entities:
Expand Down Expand Up @@ -155124,6 +155162,12 @@ entities:
parent: 2
- proto: WindoorSecureCommandLocked
entities:
- uid: 19913
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 85.5,-46.5
parent: 2
- uid: 24107
components:
- type: Transform
Expand Down Expand Up @@ -155192,12 +155236,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 25.5,-6.5
parent: 2
- uid: 24117
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 85.5,-46.5
parent: 2
- proto: WindoorSecureHeadOfPersonnelLocked
entities:
- uid: 24118
Expand All @@ -155222,7 +155260,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -159504.58
secondsUntilStateChange: -160127.22
state: Opening
- type: Airlock
autoClose: False
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
ShiningSpringStealObjective: 1
ShipyardComputerCircuitboardStealObjective: 1
SecPillCanisterStealObjective: 1
EvilSkullArtifactItemStealObjective: 1

- type: weightedRandom
id: ThiefObjectiveGroupStructure
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#this is copied from the BaseXenoArtifactItem prototyped instead of parenting because I needed to remove the random sprites and using RemoveComp sounds scary
- type: entity
parent: BaseItem
id: EvilSkullArtifactItem
name: evil skull
suffix: Hummingbird thief objective
description: Beware.
components:
- type: Sprite
sprite: Mobs/Species/Skeleton/parts.rsi
state: skull_icon
- type: Damageable
- type: Physics
bodyType: Dynamic
- type: CollisionWake
enabled: false
- type: InteractionOutline
- type: Reactive
groups:
Acidic: [Touch]
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25"
density: 20
mask:
- ItemMask
layer:
- Opaque
restitution: 0.3 # fite me
friction: 0.2
- type: Artifact
activationSound: !type:SoundPathSpecifier
params:
variation: 0.125
path: /Audio/Voice/Skeleton/skeleton_scream.ogg
nodesMax: 13
nodesMin: 5
- type: UserInterface #needs to be here for certain effects
interfaces:
enum.StorageUiKey.Key:
type: StorageBoundUserInterface
enum.TransferAmountUiKey.Key:
type: TransferAmountBoundUserInterface
enum.InstrumentUiKey.Key:
type: InstrumentBoundUserInterface
enum.IntercomUiKey.Key:
type: IntercomBoundUserInterface
- type: Appearance
- type: Item
size: Normal
- type: Actions
- type: Speech
speechSounds: Alto
speechVerb: Skeleton
- type: SkeletonAccent
- type: Vocal
sounds:
Male: Skeleton
Female: Skeleton
Unsexed: Skeleton
- type: PointLight
energy: 5
color: '#FF0000FF'
radius: 1.3
- type: StealTarget
stealGroup: EvilSkullArtifactItem
Loading

0 comments on commit 2a9e11e

Please sign in to comment.