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.

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

Test PR 2 #2

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
a4fec9e
Xeno walls
SlamBamActionman May 4, 2024
a5ee776
Fix icon smoothing for the walls
SlamBamActionman May 25, 2024
0d3f848
Added a bunch of items, and the map/shuttle
SlamBamActionman Jun 7, 2024
ae0691a
Fixed construction graphs
SlamBamActionman Jun 7, 2024
56a8fbd
Merge branch 'master' into xeno
SlamBamActionman Jun 7, 2024
c489d5d
Put the map in the right place gosh
SlamBamActionman Jun 7, 2024
bcdd9f7
Merge branch 'master' into xeno
SlamBamActionman Jun 10, 2024
4cd54b4
Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated pro…
SlamBamActionman Jun 10, 2024
6bf7baa
Fix APC names and stuff
SlamBamActionman Jun 10, 2024
1e1b117
Updated to v1.1
SlamBamActionman Jun 13, 2024
c38acc6
Updated armory
SlamBamActionman Jun 13, 2024
f307e3f
Actually commit armory
SlamBamActionman Jun 13, 2024
23e4c64
Add map to integration test
SlamBamActionman Jun 13, 2024
7991e52
Fix lawyer spawn
SlamBamActionman Jun 14, 2024
acd9ec1
Merge branch 'master' into xeno
SlamBamActionman Aug 7, 2024
811400a
Change xeno spawner to be less deadly
SlamBamActionman Aug 8, 2024
01239e7
ContainmentFieldGenerator is now able to be on from the start
SlamBamActionman Aug 8, 2024
0e997ff
Beta v1.2
SlamBamActionman Aug 8, 2024
ca394ba
Beta v 1.2.1; Fixed beacons, cargo shuttle atmos fixes; added small …
SlamBamActionman Aug 9, 2024
cd543c8
Merge branch 'master' into xeno
SlamBamActionman Sep 4, 2024
28f9cdd
Fix wall merge error, fix Solid Chitin RCD, add dark techmaint to cutter
SlamBamActionman Sep 4, 2024
2fad57f
Fix new wall price, and update map itself with voxbox, AI and better …
SlamBamActionman Sep 4, 2024
502a8a5
Fixgridatmos
SlamBamActionman Sep 4, 2024
4615f11
Merge branch 'master' into xeno
SlamBamActionman Sep 16, 2024
c9c7c72
Xeno update part 1 of 2
SlamBamActionman Sep 28, 2024
1ad9fbc
Beta v1.3, Part 2 of the updates
SlamBamActionman Oct 5, 2024
cb2252e
Merge remote-tracking branch 'upstream/master' into xeno
SlamBamActionman Oct 5, 2024
893b167
Fix faulty code missed during merges
SlamBamActionman Oct 7, 2024
ca09bf3
Xeno Beta v1.3.2
SlamBamActionman Oct 20, 2024
178cda1
Fix invalid in map file, make chapel more chapel-y
SlamBamActionman Oct 20, 2024
0a2e0e8
Xeno Beta 1.3.3; added custom evac shuttle
SlamBamActionman Oct 21, 2024
5033b75
Added a custom background
SlamBamActionman Oct 21, 2024
5187d4b
Attribution (and fix incorrectly edited texture)
SlamBamActionman Oct 21, 2024
4b6cfb0
Xeno 1.3.4; QOL changes with materials, cameras, lights and names
SlamBamActionman Nov 3, 2024
265e683
Fix attribution error
SlamBamActionman Nov 3, 2024
bc18334
Xeno 1.3.5; updated based on GH feedback
SlamBamActionman Nov 3, 2024
4da720e
Oops, missed this SpawnMobXenoPraetorian
SlamBamActionman Nov 3, 2024
2d43330
Turbo is rightfully clowning on me for forgetting to rename the spawner
SlamBamActionman Nov 4, 2024
d57889c
Merge branch 'upstream/master' into xeno
SlamBamActionman Nov 4, 2024
85591ce
Add bombing targets
SlamBamActionman Nov 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public sealed class PostMapInitTest
"Reach",
"Train",
"Oasis",
"Cog"
"Cog",
"Xeno"
};

/// <summary>
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/tiles/tiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ tiles-dark-floor-herringbone = dark steel herringbone
tiles-dark-floor-diagonal-mini = dark steel diagonal mini-tile
tiles-plastic-dark-floor = dark plastic tile
tiles-techmaint-floor = techmaint floor
tiles-techmaint-floor-dark = dark techmaint floor
tiles-reinforced-floor = reinforced floor
tiles-super-reinforced-floor = hardened reinforced floor
tiles-mono-floor = mono floor
Expand Down Expand Up @@ -129,3 +130,4 @@ tiles-jungle-astro-grass = jungle astro-grass
tiles-astro-ice = astro-ice
tiles-astro-snow = astro-snow
tiles-wood-large = large wood
tiles-xeno-floor = xeno floor
1,337 changes: 1,337 additions & 0 deletions Resources/Maps/Shuttles/cargo_xeno.yml

Large diffs are not rendered by default.

3,639 changes: 3,639 additions & 0 deletions Resources/Maps/Shuttles/emergency_xeno.yml

Large diffs are not rendered by default.

122,229 changes: 122,229 additions & 0 deletions Resources/Maps/xeno.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Prototypes/Decals/Overlays/grayscale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: decal
- type: decal
id: FullTileOverlayGreyscale
tags: ["station", "overlay"]
defaultCustomColor: true
Expand Down
52 changes: 52 additions & 0 deletions Resources/Prototypes/Entities/Effects/puddle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,58 @@
- ReagentId: Water
Quantity: 5

- type: entity
id: PuddleBloodSmall
parent: PuddleTemporary
suffix: Blood (5u)
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: Blood
Quantity: 5

- type: entity
id: PuddleBlood
parent: PuddleTemporary
suffix: Blood (30u)
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: Blood
Quantity: 30

- type: entity
id: PuddleFluorosulfuricAcidSmall
parent: PuddleTemporary
suffix: FluorosulfuricAcid (5u)
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: FluorosulfuricAcid
Quantity: 5

- type: entity
id: PuddleFluorosulfuricAcid
parent: PuddleTemporary
suffix: FluorosulfuricAcid (15u)
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: FluorosulfuricAcid
Quantity: 15

- type: entity
id: PuddleWatermelon
parent: PuddleTemporary
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,17 @@
- type: ConditionalSpawner
prototypes:
- MobHonkBot

- type: entity
name: xeno lone praetorian spawner
id: SpawnMobXenoPraetorian
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: running
sprite: Mobs/Aliens/Xenos/praetorian.rsi
- type: ConditionalSpawner
prototypes:
- MobXenoLonePraetorianNoGhost
120 changes: 120 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -454,3 +454,123 @@
amount: 2
- type: SolutionTransfer
maxTransferAmount: 1

# Mob mapped to Xeno Station that can not be ghostrole / pry

- type: entity
name: Lone Praetorian
description: The last of its kind.
parent: SimpleSpaceMobBase
id: MobXenoLonePraetorianNoGhost
components:
- type: Insulated
- type: CombatMode
- type: InputMover
- type: MobMover
- type: HTN
rootTask:
task: XenoCompound
blackboard:
NavClimb: !type:Bool
true
NavInteract: !type:Bool
true
NavPry: !type:Bool
true
NavSmash: !type:Bool
true
- type: Reactive
groups:
Flammable: [Touch]
Extinguish: [Touch]
- type: NpcFactionMember
factions:
- Xeno
- type: Hands
- type: ComplexInteraction
- type: MobState
allowedStates:
- Alive
- Dead
- type: Stamina
critThreshold: 200
- type: Bloodstream
bloodReagent: FluorosulfuricAcid
bloodMaxVolume: 300
- type: MeleeWeapon
altDisarm: false
angle: 0
soundHit:
collection: AlienClaw
animation: WeaponArcBite
damage:
groups:
Brute: 4
- type: DamageStateVisuals
rotate: true
states:
Alive:
Base: running
Critical:
Base: crit
Dead:
Base: dead
- type: Puller
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeatXeno
amount: 5
- type: TypingIndicator
proto: alien
- type: Temperature
heatDamageThreshold: 360
coldDamageThreshold: -150
currentTemperature: 310.15
- type: NoSlip
- type: Perishable #Ummmm the acid kills a lot of the bacteria or something
molsPerSecondPerUnitMass: 0.0005
- type: Speech
speechVerb: LargeMob
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Xenos/praetorian.rsi
offset: 0,0.4
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: running
- type: MobThresholds
thresholds:
0: Alive
200: Dead
- type: SlowOnDamage
speedModifierThresholds:
120: 0.7
- type: MovementSpeedModifier
baseSprintSpeed: 3.7
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.45
density: 15500
mask:
- MobMask
layer:
- MobLayer
- type: Tag
tags:
- CannotSuicide
- type: SolutionContainerManager # Being hit speeds you up so you can escape
solutions:
bite:
reagents:
- ReagentId: Stimulants
Quantity: 50
- ReagentId: TranexamicAcid
Quantity: 50
- type: MeleeChemicalInjector
transferAmount: 1
solution: bite
pierceArmor: true
32 changes: 32 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,22 @@
- type: Stack
stackType: FloorTileTechmaint

- type: entity
name: dark techmaint floor
parent: FloorTileItemBase
id: FloorTileItemTechmaintDark
components:
- type: Sprite
state: techfloordark
- type: Item
heldPrefix: dark
- type: FloorTile
outputs:
- Plating
- FloorTechMaintDark
- type: Stack
stackType: FloorTileTechmaintDark

# TODO add a catwalk tile item once tile smoothing is supported

- type: entity
Expand Down Expand Up @@ -1566,3 +1582,19 @@
- type: Construction
graph: TileWoodLarge
node: woodtilelarge

- type: entity
id: FloorTileItemXeno
parent: FloorTileItemBase
name: xeno floor
components:
- type: Sprite
state: xenofloor
- type: Item
heldPrefix: steel
- type: FloorTile
outputs:
- Plating
- FloorXeno
- type: Stack
stackType: FloorTileXeno
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,20 @@
- state: tip
map: [ "enum.AmmoVisualLayers.Tip" ]
color: "#65fe08"


- type: entity
id: CartridgePistolSpent
name: cartridge (.35 auto)
suffix: spent
parent: BaseCartridgePistol
components:
- type: SpentAmmoVisuals
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
layers:
- state: base-spent
map: [ "enum.AmmoVisualLayers.Base" ]
- type: CartridgeAmmo
proto: BulletPistol
spent: true
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,7 @@
- FloorTileItemGratingMaint
- FloorTileItemTechmaint
- FloorTileItemSteelMaint
- FloorTileItemTechmaintDark
- FloorTileItemWood
- FloorTileItemWoodLarge
- FloorTileItemWoodPattern
Expand Down
46 changes: 46 additions & 0 deletions Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,49 @@
map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
shader: unshaded
visible: false

- type: entity
id: RustedThruster
parent: BaseStructureDynamic
name: rusted thruster
description: An unrepairable thruster, broken down from wear and tear. Practically useless.
components:
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
density: 60
mask:
- MachineMask
layer:
- MachineLayer
- type: Transform
anchored: true
- type: Physics
bodyType: Static
- type: Rotatable
rotateWhileAnchored: true
- type: Sprite
sprite: Structures/Shuttles/old_thruster.rsi
state: base
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Electronic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100 # Considering we need a lot of thrusters didn't want to make an individual one too tanky
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- type: StaticPrice
price: 100
placement:
mode: SnapgridCenter

28 changes: 28 additions & 0 deletions Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,31 @@
node: assembly
- type: Transform
anchored: true

- type: entity
id: AirAlarmXeno
parent: AirAlarm
name: air alarm
description: An alien air alarm. Hopefully they didn't breathe poison.
components:
- type: Sprite
sprite: Structures/Wallmounts/air_monitors_xeno.rsi
layers:
- state: alarm0
map: ["airAlarmBase"] # TODO: fire alarm enum
- state: alarmx
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Construction

- type: entity
id: AirAlarmAssemblyXeno
parent: AirAlarmAssembly
name: air alarm assembly
description: An alien air alarm. Why are the wires pulsating?...
components:
- type: Sprite
sprite: Structures/Wallmounts/air_monitors_xeno.rsi
layers:
- state: alarm_b1
map: [ "enum.ConstructionVisuals.Layer" ]
- type: Construction
Loading
Loading