-
Notifications
You must be signed in to change notification settings - Fork 626
Moproach Port From Wizden #4164
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
Closed
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
8a94edf
ported Moproach from wizden
93c2c3d
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 9fcd654
faction thingy
f7a5bc4
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 8d87e7a
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 3b671ec
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 3698c98
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 56aecb1
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej ca27f40
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej 258ef5b
Merge branch 'main' into Moproach-Port
lordsej d40a91c
Merge branch 'main' into Moproach-Port
lordsej e91aca1
Merge branch 'Monolith-Station:main' into Moproach-Port
lordsej File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| - type: entity | ||
| name: moproach | ||
| parent: MobMothroach | ||
| id: MobMoproach | ||
| description: This little mothroach has mopshoes on its feet! How adorable! | ||
| components: | ||
| - type: GhostRole | ||
| makeSentient: true | ||
| allowSpeech: true | ||
| allowMovement: true | ||
| name: ghost-role-information-moproach-name | ||
| description: ghost-role-information-moproach-description | ||
| rules: ghost-role-information-freeagent-rules | ||
| mindRoles: | ||
| - MindRoleGhostRoleFreeAgentHarmless | ||
| - type: Fixtures | ||
| fixtures: | ||
| fix1: | ||
| shape: | ||
| !type:PhysShapeCircle | ||
| radius: 0.2 | ||
| density: 120 | ||
| mask: | ||
| - SmallMobMask | ||
| layer: | ||
| - SmallMobLayer | ||
| - type: GhostTakeoverAvailable | ||
| - type: Speech | ||
| speechVerb: Moth | ||
| speechSounds: Squeak | ||
| allowedEmotes: ['Chitter', 'Squeak'] | ||
| - type: FaxableObject | ||
| insertingState: inserting_mothroach | ||
| - type: MothAccent | ||
| - type: Sprite | ||
| sprite: Mobs/Animals/mothroach/moproach.rsi | ||
| layers: | ||
| - map: ["enum.DamageStateVisualLayers.Base", "movement"] | ||
| state: mothroach | ||
| - type: SpriteMovement | ||
| movementLayers: | ||
| movement: | ||
| state: mothroach-moving | ||
| noMovementLayers: | ||
| movement: | ||
| state: mothroach | ||
| - type: Item | ||
| size: Normal | ||
| - type: Clothing | ||
| quickEquip: false | ||
| sprite: Mobs/Animals/mothroach/moproach.rsi | ||
| equippedPrefix: 0 | ||
| slots: | ||
| - HEAD | ||
| - type: Appearance | ||
| - type: DamageStateVisuals | ||
| states: | ||
| Alive: | ||
| Base: mothroach | ||
| Critical: | ||
| Base: mothroach_dead | ||
| Dead: | ||
| Base: mothroach_dead | ||
| - type: MobThresholds | ||
| thresholds: | ||
| 0: Alive | ||
| 45: Critical | ||
| 65: Dead | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed : 3 | ||
| baseSprintSpeed : 5 # extra speed for that moppin'! | ||
| weightlessAcceleration: 1.5 | ||
| weightlessFriction: 1 | ||
| baseWeightlessModifier: 1 | ||
| - type: HTN | ||
| rootTask: | ||
| task: MoproachCompound | ||
| - type: Absorbent | ||
| pickupAmount: 7.5 # small feet | ||
| - type: UseDelay | ||
| delay: 0.5 # quick feet | ||
| - type: SolutionRegeneration | ||
| solution: absorbed | ||
| generated: | ||
| reagents: | ||
| - ReagentId: Water | ||
| Quantity: 5 | ||
| - type: SolutionPurge | ||
| solution: absorbed | ||
| preserve: | ||
| - Water | ||
| quantity: 10 | ||
| - type: SolutionContainerManager | ||
| solutions: | ||
| absorbed: | ||
| maxVol: 100 | ||
| - type: Damageable | ||
| damageContainer: Biological | ||
| damageModifierSet: Moth | ||
| - type: Bloodstream | ||
| bloodReagent: InsectBlood | ||
| - type: Respirator | ||
| damage: | ||
| types: | ||
| Asphyxiation: 0.5 | ||
| damageRecovery: | ||
| types: | ||
| Asphyxiation: -0.5 | ||
| - type: CombatMode | ||
| - type: Butcherable | ||
| spawned: | ||
| - id: FoodMeatSlime | ||
| amount: 2 | ||
| - id: HideMothroach # Frontier | ||
| amount: 1 # Frontier | ||
| prob: 0.3 # Frontier | ||
| - type: Extractable | ||
| grindableSolutionName: food | ||
| - type: LanguageKnowledge # Einstein Engines - Language | ||
| speaks: | ||
| - Moffic | ||
| understands: | ||
| - Moffic | ||
| - type: ZombieAccentOverride | ||
| accent: zombieMoth | ||
| - type: Vocal | ||
| sounds: | ||
| Male: UnisexMoth | ||
| Female: UnisexMoth | ||
| Unsexed: UnisexMoth | ||
| wilhelmProbability: 0.001 | ||
| - type: MobPrice | ||
| price: 150 | ||
| - type: Temperature | ||
| heatDamageThreshold: 423 | ||
| coldDamageThreshold: 0 | ||
| - type: Tag | ||
| tags: | ||
| - Trash | ||
| - CannotSuicide | ||
| - VimPilot | ||
| - type: MovementAlwaysTouching | ||
| - type: PressureImmunity | ||
| - type: ProtectedFromStepTriggers | ||
| - type: Insulated | ||
| - type: CanEscapeInventory | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - Mouse | ||
| - type: Body | ||
| prototype: Mothroach | ||
| - type: SurgeryTarget # Shitmed | ||
| - type: TypingIndicator | ||
| proto: moth | ||
| - type: Destructible | ||
| thresholds: | ||
| - trigger: | ||
| !type:DamageTypeTrigger | ||
| damageType: Blunt | ||
| damage: 60 | ||
| behaviors: | ||
| - !type:GibBehavior { } | ||
| - type: FireVisuals | ||
| sprite: Mobs/Effects/onfire.rsi | ||
| normalState: Mouse_burning | ||
| - type: Strippable | ||
| - type: UserInterface | ||
| interfaces: | ||
| enum.StrippingUiKey.Key: | ||
| type: StrippableBoundUserInterface | ||
| enum.SurgeryUIKey.Key: # Shitmed | ||
| type: SurgeryBui | ||
| - type: InventorySlots | ||
| - type: Inventory | ||
| speciesId: hamster | ||
| templateId: hamster | ||
| displacements: | ||
| head: | ||
| sizeMaps: | ||
| 32: | ||
| sprite: Mobs/Animals/mothroach/displacement.rsi | ||
| state: head | ||
| mask: | ||
| sizeMaps: | ||
| 32: | ||
| sprite: Mobs/Animals/mothroach/displacement.rsi | ||
| state: mask | ||
| suitstorage: | ||
| sizeMaps: | ||
| 32: | ||
| sprite: Mobs/Animals/mothroach/displacement.rsi | ||
| state: suitstorage | ||
| eyes: | ||
| sizeMaps: | ||
| 32: | ||
| sprite: Mobs/Animals/mothroach/displacement.rsi | ||
| state: eyes | ||
| neck: | ||
| sizeMaps: | ||
| 32: | ||
| sprite: Mobs/Animals/mothroach/displacement.rsi | ||
| state: neck |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 1 addition & 6 deletions
7
Resources/ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,6 @@ | ||
| <Document> | ||
| # Minor Factions | ||
|
|
||
| Minor factions are motivated groups who, over time, have earned a distinct reputation in the sector. While often acting as armed groups and dangerous in their own right, they often lack the strength or motivation to find themselves involved in direct conflict with either the [color=cyan]TSFMC[/color] or [color=gold]PDV[/color]. | ||
| While the sector is filled with "Factions" there are some considered less prominent or influential on a large scale than others. These are aptly generalized as "Minor Factions." They consist of smaller groups or communities that have come to Colossus in search of their own respective reasons be it religion, money, or happenstance. | ||
|
|
||
| > The [color=yellow]USSP Remnants[/color] are a defeated but determined force, eroded to the point that the powers vying to control the sector no longer consider them a major threat. | ||
|
|
||
| > The [color=red]Viper Group[/color] are a band of professional operatives resembling the Gorlex Marauders of the corporate era, selling their services to whoever can meet their price. | ||
|
|
||
| These groups do not engage either the [color=cyan]TSFMC[/color] or [color=gold]PDV[/color] on sight, and find themselves acting on the same level as the many [color=green]Mercs[/color] of the sector. | ||
| </Document> |
Binary file added
BIN
+1.26 KB
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+956 Bytes
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+939 Bytes
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions
60
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf, all edited by lzk228", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "icon" | ||
| }, | ||
| { | ||
| "name": "mothroach", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "mothroach-moving", | ||
| "directions": 4, | ||
| "delays": [ | ||
| [ | ||
| 0.2, | ||
| 0.2, | ||
| 0.2 | ||
| ], | ||
| [ | ||
| 0.2, | ||
| 0.2, | ||
| 0.2 | ||
| ], | ||
| [ | ||
| 0.2, | ||
| 0.2, | ||
| 0.2 | ||
| ], | ||
| [ | ||
| 0.2, | ||
| 0.2, | ||
| 0.2 | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "name": "mothroach_dead", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "0-equipped-HELMET", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+3.27 KB
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.51 KB
Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pretty sure the Minor_Factions.xml got stuck in after syncing with one of the monolith updates. iv been working for a complete mothroach overhaul including moproach. will be aiming to PR that today and close this one down