Skip to content

Commit

Permalink
Revert "Merge pull request #91 from NIKforest/master-andromeda"
Browse files Browse the repository at this point in the history
This reverts commit e4ff061.
  • Loading branch information
13lackHawk committed Mar 23, 2024
1 parent e4ff061 commit 271bfc3
Show file tree
Hide file tree
Showing 42 changed files with 1 addition and 1,559 deletions.
Binary file removed Resources/Audio/Andromeda/Liquid/Liquid/scream.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1,294 changes: 0 additions & 1,294 deletions Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml

This file was deleted.

40 changes: 1 addition & 39 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,6 @@
layer:
- SmallMobLayer
- type: GhostTakeoverAvailable
- type: Puller
needsHands: false
- type: Speech
speechVerb: Moth
speechSounds: Squeak
Expand Down Expand Up @@ -722,8 +720,6 @@
offspring:
- id: MobCow
- type: ReproductivePartner
- type: Puller
needsHands: false
- type: Physics
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -803,8 +799,6 @@
movement:
state: crab
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -873,8 +867,6 @@
- MobMask
layer:
- MobLayer
- type: Puller
needsHands: false
- type: Tag
tags:
# let moths eat wool directly
Expand Down Expand Up @@ -1003,8 +995,6 @@
state: crawling
sprite: Mobs/Animals/gorilla.rsi
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -1072,8 +1062,6 @@
layer:
- MobLayer
- type: Physics
- type: Puller
needsHands: false
- type: Inventory
speciesId: kangaroo
templateId: kangaroo
Expand Down Expand Up @@ -1159,8 +1147,6 @@
templateId: monkey
speciesId: monkey
- type: InventorySlots
- type: Puller
needsHands: false
- type: Cuffable
- type: RotationVisuals
defaultRotation: 90
Expand Down Expand Up @@ -1893,8 +1879,6 @@
state: penguin
sprite: Mobs/Animals/penguin.rsi
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2078,8 +2062,6 @@
movement:
state: tarantula
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2265,8 +2247,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: possum
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2342,8 +2322,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: raccoon
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2408,8 +2386,6 @@
movement:
state: fox
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2469,8 +2445,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: corgi
- type: Physics
- type: Puller
needsHands: false
- type: Speech
speechVerb: Canine
- type: Fixtures
Expand Down Expand Up @@ -2622,8 +2596,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: cat
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2746,8 +2718,6 @@
heatDamageThreshold: 423
coldDamageThreshold: 0
- type: PressureImmunity
- type: Puller
needsHands: false
- type: InteractionPopup
successChance: 0.7
interactSuccessString: petting-success-space-cat
Expand Down Expand Up @@ -2818,8 +2788,6 @@
- type: MovementSpeedModifier
baseWalkSpeed : 1
baseSprintSpeed : 1
- type: Puller
needsHands: false
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Pets/sloth.rsi
Expand Down Expand Up @@ -2884,8 +2852,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: ferret
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -2944,8 +2910,6 @@
name: ghost-role-information-hamster-name
description: ghost-role-information-hamster-description
- type: GhostTakeoverAvailable
- type: Puller
needsHands: false
- type: Speech
speechVerb: SmallMob
speechSounds: Squeak
Expand Down Expand Up @@ -3083,8 +3047,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: pig
sprite: Mobs/Animals/pig.rsi
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -3232,4 +3194,4 @@
components:
- type: ReplacementAccent
accent: nymph


2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@
name: ghost-role-information-sentient-carp-name
description: ghost-role-information-sentient-carp-description
- type: GhostTakeoverAvailable
- type: Puller
needsHands: false
- type: HTN
rootTask:
task: DragonCarpCompound
Expand Down
6 changes: 0 additions & 6 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: bingus
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -258,8 +256,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: mcgriff
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -359,8 +355,6 @@
- map: ["enum.DamageStateVisualLayers.Base"]
state: walter
- type: Physics
- type: Puller
needsHands: false
- type: Fixtures
fixtures:
fix1:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
baseSprintSpeed : 5.00
- type: InputMover
- type: MobMover
- type: Puller
needsHands: false
- type: HTN
rootTask:
task: SimpleHostileCompound
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
speechVerb: LargeMob
- type: CombatMode
- type: MobMover
- type: Puller
needsHands: false
- type: InputMover
- type: AntiRottingContainer #A-13 Dragon fix full
- type: MovementSpeedModifier
Expand Down
19 changes: 0 additions & 19 deletions Resources/Textures/Andromeda/NIKforest/badshadow.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 0 additions & 26 deletions Resources/Textures/Andromeda/NIKforest/cosmobackpack.rsi/meta.json

This file was deleted.

Binary file not shown.
14 changes: 0 additions & 14 deletions Resources/Textures/Andromeda/NIKforest/fakebackpack.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
43 changes: 0 additions & 43 deletions Resources/Textures/Andromeda/NIKforest/intechcorri.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 0 additions & 24 deletions Resources/Textures/Andromeda/NIKforest/liguid.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 0 additions & 18 deletions Resources/Textures/Andromeda/NIKforest/littlespider.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 271bfc3

Please sign in to comment.