From 8a94edfa9d0709e843cd0c9dc2e2c73de38627d7 Mon Sep 17 00:00:00 2001 From: solomam Date: Mon, 29 Jun 2026 16:18:35 +0100 Subject: [PATCH 1/2] ported Moproach from wizden Signed-off-by: solomam --- .../ghost/roles/ghost-role-component.ftl | 3 + .../Entities/Markers/Spawners/mobs.yml | 15 ++ .../Entities/Mobs/NPCs/moproach.yml | 202 ++++++++++++++++++ .../Objects/Specific/Janitorial/janitor.yml | 1 + .../Objects/Specific/rehydrateable.yml | 2 +- Resources/Prototypes/GameRules/pests.yml | 2 + Resources/Prototypes/NPCs/mob.yml | 13 ++ .../moproach.rsi/0-equipped-HELMET.png | Bin 0 -> 1295 bytes .../Animals/mothroach/moproach.rsi/icon.png | Bin 0 -> 581 bytes .../mothroach/moproach.rsi/inhand-left.png | Bin 0 -> 956 bytes .../mothroach/moproach.rsi/inhand-right.png | Bin 0 -> 939 bytes .../Animals/mothroach/moproach.rsi/meta.json | 60 ++++++ .../moproach.rsi/mothroach-moving.png | Bin 0 -> 3353 bytes .../mothroach/moproach.rsi/mothroach.png | Bin 0 -> 1760 bytes .../mothroach/moproach.rsi/mothroach_dead.png | Bin 0 -> 2575 bytes 15 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png create mode 100644 Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 6f1af23fa26..c2d185a7031 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -35,6 +35,9 @@ 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-moproach-name = Moproach +ghost-role-information-moproach-description = A cute mothroach with more cute moplike shoes on its feet. + 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! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index 0c39868950a..5060546fe36 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -32,6 +32,21 @@ prototypes: - MobCockroach +- type: entity + parent: MarkerBase + id: SpawnMobMoproach + name: Moproach Spawner + components: + - type: Sprite + layers: + - state: green + - sprite: Mobs/Animals/mothroach/moproach.rsi + state: icon + - state: ai + - type: ConditionalSpawner + prototypes: + - MobMoproach + - type: entity name: HoP Corgi Spawner id: SpawnMobCorgi diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml new file mode 100644 index 00000000000..de568d0c7f4 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index d26813424b7..47f186f6e77 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -288,6 +288,7 @@ SpacemenFigureSpawner: 28 SpawnMobCockroach: 5 MaintenanceToolSpawner: 5 + SpawnMobMoproach: 2 - type: entity parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index e02f6774060..9b404457cde 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -95,7 +95,7 @@ - MobMothroach # Frontier - MobMothroach # Frontier - MobRosyMothroach # Frontier - + - MobMoproach # wizden - type: entity parent: MonkeyCube id: MouseCube diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml index a840f9aeb65..8152b51ba6a 100644 --- a/Resources/Prototypes/GameRules/pests.yml +++ b/Resources/Prototypes/GameRules/pests.yml @@ -87,6 +87,8 @@ prob: 0.005 # Mono - id: MobRosyMothroach # Frontier prob: 0.005 # Mono + - id: MobMoproach + prob: 0.001 specialEntries: # Mono - id: MobCorticalBorer # Mono prob: 0.001 # Mono diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml index dd3378618a6..16ff03df87d 100644 --- a/Resources/Prototypes/NPCs/mob.yml +++ b/Resources/Prototypes/NPCs/mob.yml @@ -32,6 +32,19 @@ - !type:HTNCompoundTask task: IdleCompound +- type: htnCompound + id: MoproachCompound + branches: + - tasks: + - !type:HTNCompoundTask + task: FoodCompound + - tasks: + - !type:HTNCompoundTask + task: BufferNearbyPuddlesCompound + - tasks: + - !type:HTNCompoundTask + task: IdleCompound + - type: htnCompound id: GlockroachCompound branches: diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f756efee726de9dbc2f1ef6b2315b3a43f09aa71 GIT binary patch literal 1295 zcma)+{WsGK0EfS`x2AbpXys*{k`9eBl*X=&mARQ4$xEwjrq)W5E6I+L*W+HyRI4p7 zsZ>YHX3ERDTgwhPWhl9dT4&utc~2zva`hM7`@{2j&hrm^iuZ+wSeUOj2LQk#ltPYN zG4Us>U@KeCKBHX`B83w7I{>Uk{RH aj$kkSC#JQdGu~$%8bCU4$)Re?(%mZN#zN z_K8QKg#~opRuqiyN?zz|b+d`ZkRswEZMhIW2?OOuRS*magL}|l3Stz>-8)ZqCF&~U zAc@>BzRAL$o$jt|tA4>rvFys~7Agkca3%>~hC~hHpg`p8sv#Yyr2dO;0t>AlhIm&OotWn-h) z(d9xRTet=cp68(|1H8(n#y=a91@S&c^{*;-Af>tP!QuF&jXXz%c71vmleYicmet7> zS>t%P9pJyme%k$2-sg*y^r?F3sg{$@<7llj7D* zpvLbee<>Swzzo*RFO0ChJ^UwYXQ;?`;O&!!M_$wQ2)Wn9fVQtqk=Y}_o=`T+%Vws* zn^|tl0nD73q7Re!`J7TPoF&ZGOABzIts>_QZy`E>dbbg$mUW)Vl2WBgr54xI@#t$Q zOXqUYC`P`vs0r?zzu_KpK6M@)Ch{(ga*lOs?3pDraN1%^H!YWd^vgE=U~#S^)heX} z*w(c5gaZ$ctp+W2E7v|$FSvcTrK@Ir=+ki{nqE(?oxNqwa96!7z719G6dMT0Hr0y= zHK6*VVLOi0fc|G`ZF&J38(HBedH(*sg%EM|8f`=fLsJFugO^06O^2@aZ{r1%JH)wF zkst3`v=f)Qqn+F*9(#l8GQ|*3(P(3-@!j45rcIl+5z?u6EDq*m4;bH8!c~WeVvim7 za$@MvWAtoY|8)l#rS6>K8OHaiPMD*0ezFv&LLk zZ6{PiLH4{;lYiHC60MSKNmEap7mbxZ*DR?sMIi{lTN+G6K&lV!ND6^rpHu4kYCBk? zMgp|t=~Kf-vfImM>sh63a%h6aMTA2tRfV|P19ukdhM?F~dzH~IO^n7I|A9q>41*b02b>A@m z0_PFvc88lc=L8l`z--7>$a$s7YuMoR(TajRo1UPlVXi6hRmo--LFG;n0~0@x`#hMk h*(KzER%r%I4}zwRfA>3%8((=iAar*)xgm(2`!7j3RI&g7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1923b5d59486b4830df142da82a6e6ceb7f8df02 GIT binary patch literal 581 zcmV-L0=oT)P)` z?!Ax54ATMA0n>p$c0l3qhqO=~Oqoq+C~AjZ#rXam7*guj8ZoUL0Y;1@bJ)8mrxvLu zH;Cf)ZQ%le0~v@VIcmP8dC>x5CM`Ld^)VXm0t9I9o9~|%ih-YA8-!Rcbv_= z{3{2`f!**v*?R2+Vmu(R_4QCTbE7}VQI{Ctv93|D&%kDITUhLL4biY`gc5skn()u* z{m)_tW2f@_CnckcBFBgvbp&w0V_hRL>@y&m#Z?W5 z3>F6|MIXg`y+6oN$2?JiMUKTR2P8|6OQ|i zz!w_>U!TpSDu1WyR&b(e0g=-}<*;p0Y-6gXKla_faza*%g**`sbrr+53Sf8OLUZ(Y zQ|{rJFdnTt_4PBWSxwe4rlX^*-Yn2hIq#E?QT!bRaU5o{!d-;G!Z+K37X z5(^PbBZ$~2NWj9vXctf$4>6!to{fqiiUuSeieREA@eY!JN>F0L1q50BkIXVIw>LZ4 zC)}_z5a#w{e*514y_q5V*7JRz(%hD$*?IWx1aKLUas}KJNO=OdMbJ$FHw99zfSUp- zPXM|B)~ z#IyTP1K)P;+a*L<(UPI24gG;INu6&v0bmeBxN~iocK03${Cj-sCLKE7!{U7Y)ONoz z{f)A#TdD8z^F%=l2Y_W4cvE~WxH}G9r0V>v=+Wf)BvBtY+$EexLyzMmy#FGAgg(rl z5I<$lWoS?TQQEVA8y!1yk_#Dd5-oy~@~H4a7&vmT5P)-=I|=7G+VIegzZfQ-Y7@&8 z0I*aXCpaztaLm;(_s`!R^U!m*L<O5Ucf zoIhW!(nNWZZC5cCKsqg*Ie4z*S0-mDyQYoMkLI^}-F+jzJVt-_LM|{^x9zHYl@sRT zxR#(get3+r0E>xYBadNQ0~*=MdbT+MY>gb3-7W*Tl(d!OGQifzaoO!MfJ;eRIW7Zi zjU1QVE(5rfw3XvBz}Cod+3hlbOG#TfE(2_h9GBgx&j4*WbbOZg<6@{_aTHGH@t z9mTBordTV0si7!j$}uQpnvRdUU**cGGe_-F`&!&I1Ez~t0|8JW<`4nStCi>0<-cfR z{2k3ze~OBf?iuwmfPD>+)nW9UP30o;ZS5VAc#{fpYysjzXQn<<;mTf4-vbu7;J0L! zi4QNL8fu7f?TsZsTo?@M$gLNtiAu39HRGxT4tU^#zpitm`1SzRXZh_wEmj=6wE_TQ zQk5;2J_uX5oDVOk;7jLm4OL^+dDZDSnV=OQZj|JGh{~4U>ujsP`h0M~$HEtOT;7N8 z6zXL~*dMI`c#sJ&|MG{aW=8jeKltFQ7*p$6@?#BLhuu*^$%nFUgR-Qpmc)%bjJWv^ z7gzo%yUTKXcnGF}>Uh0vP%8k3@r}&TPJu=?p2IdL0Edb;Gh7DP96b)(T?TNdXfwlQ efX&h4u>Cizv1fCsb1*3Y00002BR01_tI> zPZ!6KinzB?wizOhB6X{kR3uzH6;%$+J(Q``QMBZPyrT|Fu1hORXRF3CL6u9t$t72dH8Q7|Fo0u&hDvv zUw!|~gumAcW2b-0;r=worbwKjh0)U8VVc7^PKDVEbQmLs|M+Up)Q)k8Wnpqd&`Ex0Dviw5Q$Y-5Gqjlu5wzq_RQc$M(Xnx|L7%Kw~J5w)5Y{C{ft z!lS%mrz*Ji$W<@>m4Caw^ObS%s@9j!Jy-qu>3mnKQX=Y3@uOtfW`1q;Df)MdWd8Tt z?PYe)_`XlK5l<`omp<@hZ$&$@!d~ zuerZ_ny&dD;cWyHltb~@W1Y_7Cc z?Q^)%xY@M)&t(?Tux-M(E}lwTzP$d()$bYa<224%vst?L^YU5Q?dPwLIcQP%{=IZh ze`&}KmN{QGPONsgB)p;5pJ9Wm!Q02JjG5~f2>?H?CX9^mzzL6`yBV zY#{WF%`BpDe^kt!O2fjW%q!7Z$_z49^=tMn=Y87CqAK}li5zp`B;$FPmq*qaZvVKo zLWEgBLS*r_Ye%>2%9i#07xm&Pv*=Dig#^C+R(AvKK^ddJ)EB%BhbUc5oY&7#7l?il0t&>6~|)cr(Z57Wc{CGn4rVX za!u$!%L=o7q8!Eyj5lQ*a$fD0%bxs5rP=Po?Vk5SJq!wle{XV5;^$uQ>Cy62i60J@ zU#c&j+;v;Oul~qd$*fuJwLDFJiG0nIESG$-EPj^qa>q}}-`P9uG|Jt5g-Ut4Y~)%K zuGOdKH$}2KF`URs-C4=Wyu%}P>wE)+)l;87n_A8GhjH$<&fFRS^EtrW$KdJe=d#Wz Gp$P!FBc`zc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json new file mode 100644 index 00000000000..3629b336ee4 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json @@ -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 + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png new file mode 100644 index 0000000000000000000000000000000000000000..929cf998c8efb5206892016ae166a4cbde4c3542 GIT binary patch literal 3353 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 literal 0 HcmV?d00001 From 9fcd6546d1a1839d3246cbf6719123a3ac10763c Mon Sep 17 00:00:00 2001 From: solomam Date: Mon, 29 Jun 2026 17:14:52 +0100 Subject: [PATCH 2/2] faction thingy Signed-off-by: solomam --- .../ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Resources/ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml b/Resources/ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml index 78960408a69..67f43bc2c74 100644 --- a/Resources/ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml +++ b/Resources/ServerInfo/_Mono/Guidebook/Factions/Minor_Factions.xml @@ -1,11 +1,6 @@ # 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.