Skip to content

Commit

Permalink
Moth Maggots (Goob-Station#852)
Browse files Browse the repository at this point in the history
yuh
  • Loading branch information
Aidenkrz authored Nov 12, 2024
1 parent 1beaaf3 commit 0e4d844
Show file tree
Hide file tree
Showing 29 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ghost-role-information-nukie-reinforcement-name = Nuclear Operative
ghost-role-information-nukie-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them.
ghost-role-information-nukie-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you.
ghost-role-information-SyndiRoach-name = SyndiRoach
ghost-role-information-SyndiRoach-name = SyndiMaggot
ghost-role-information-SyndiRoach-description = You're the faithful trained pet of nuclear operatives with a microbomb. Serve your master to the death!
ghost-role-information-SyndiRoach-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ uplink-miniature-energy-crossbow-desc = The syndicate's energy crossbow, small,
uplink-pie-cannon-name = Regenerating Pie Cannon
uplink-pie-cannon-desc = A pie cannon that automatically regenerates pies, one every ten seconds.
uplink-mobroach-microbomb-name = SyndiRoach Teleporter
uplink-mobroach-microbomb-desc = Call in a handy mothroach equipped with a microbomb implant. Explodes when seriously injured.
uplink-mobroach-microbomb-name = SyndiMaggot Teleporter
uplink-mobroach-microbomb-desc = Call in a handy moth maggot equipped with a microbomb implant. Explodes when seriously injured.
uplink-advanced-combat-medipen-name = Advanced Combat Medipen
uplink-advanced-combat-medipen-desc = An advanced single-use medipen containing chemicals that will rapidly heal most types of damage taken in a fight.
Expand Down
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ ghost-role-information-silicon-rules = You are a [color=#6495ed][bold]Silicon[/b
ghost-role-information-mouse-name = Mouse
ghost-role-information-mouse-description = A hungry and mischievous mouse.
ghost-role-information-mothroach-name = Mothroach
ghost-role-information-mothroach-description = A cute but mischievous mothroach.
ghost-role-information-mothroach-name = Moth Maggot
ghost-role-information-mothroach-description = A cute but mischievous grub.
ghost-role-information-snail-name = Snail
ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
Expand Down Expand Up @@ -252,7 +252,7 @@ ghost-role-information-medical-description = You are a medical professional, but
ghost-role-information-cargo-name = Cargo
ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
ghost-role-information-engineering-name = Engineering
ghost-role-information-engineering-name = Engineering
ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
ghost-role-information-science-name = Science
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Crates/npc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@
- type: entity
id: CrateNPCMothroach
parent: CrateLivestock
name: crate of mothroaches
description: A crate containing four mothroaches.
name: crate of moth maggots
description: A crate containing four moth maggots.
components:
- type: StorageFill
contents:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,10 @@
- id: FoodMeatSlime

- type: entity
name: mothroach
name: moth maggot
parent: MobCockroach
id: MobMothroach
description: This is the adorable by-product of multiple attempts at genetically mixing mothpeople with cockroaches.
description: This is the adorable by-product of multiple attempts at genetically mixing mothpeople with maggots.
components:
- type: GhostRole
makeSentient: true
Expand Down Expand Up @@ -1762,7 +1762,7 @@
name: food-sequence-content-rat
skewer:
name: food-sequence-content-rat
sprite:
sprite:
sprite: Objects/Consumable/Food/skewer.rsi
state: skewer-rat

Expand Down Expand Up @@ -3407,7 +3407,7 @@
- type: HTN
rootTask:
task: RuminantCompound

- type: entity
name: diona nymph
parent: [SimpleMobBase, StripableInventoryBase]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
- type: entity
parent: MonkeyCube
id: MothroachCube
name: mothroach cube
name: moth maggot cube
components:
- type: Rehydratable
possibleSpawns:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@

- type: microwaveMealRecipe
id: RecipeMothRoachburger
name: mothroachburger recipe
name: mothmaggotburger recipe
result: FoodBurgerMothRoach
solids:
FoodBreadBun: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@
- type: Perishable

- type: entity
name: syndiroach
name: syndimaggot
id: MobMothSyndy
parent: MobMothroach
description: Explosive moth.
description: Explosive maggot.
components:
- type: Sprite
sprite: _Goobstation/Mobs/Animals/syndiroach.rsi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: entity
parent: ReinforcementRadio
id: ReinforcementRadioSyndicateSyndiRoach
name: syndiroach reinforcement radio
description: Calls in a faithfully trained mothroach with a microbomb to assist you.
name: syndimaggot reinforcement radio
description: Calls in a faithfully trained moth maggot with a microbomb to assist you.
components:
- type: GhostRole
name: ghost-role-information-SyndiRoach-name
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/icon.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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf",
"copyright": "Sprites regretfully handcrafted by BeeRobyn on Discord https://github.com/BeeRobynn",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf",
"copyright": "Sprites regretfully handcrafted by BeeRobyn on Discord https://github.com/BeeRobynn",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0e4d844

Please sign in to comment.