Commit Graph

77 Commits

Author SHA1 Message Date
Kara 696d7b8878
Minor slime fix (#27237)
(cherry picked from commit 85c6383cc025289d3376ef0e76f358483b888b18)
2024-05-02 23:58:05 +02:00
Just-a-Unity-Dev 8086508273
General slime improvements (#23425)
* General slime improvements

* Finish morphing

* oops 2x2 not 3x3

* actually lets ball - 2x3 inventory

* Last two things on the todo list

* .\RobustToolbox\

* JUST COMPILE

* fix tests 2.0

* fix tests 3.0

* Do reviews

* minor change

* guideboob

* more

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

(cherry picked from commit fd0ca42c58315b4c4f91fe9364c3dc3d88ba5624)
2024-05-02 23:57:52 +02:00
Wrexbe (Josh) 5085286dd0
Fixed some icon rsi warnings (#26414)
Fixed some icon warnings

Co-authored-by: wrexbe <wrexbe@protonmail.com>
(cherry picked from commit 5562bcebcb114892616383a95f5d5a8884c09bbb)
2024-03-27 18:34:34 +01:00
nikthechampiongr 6d38428b56
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)
* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect

* Move check up to apply to all actions and do thing I forgor to do before

* Change check into an ActionBlocker check that also checks whether the user is sleeping.

* Make checking for Consciousness the default for actions

Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.

* Fix typos my beloved

I had an unbelievable skill issue

* Fix major skill issue

(cherry picked from commit 22e9d6562f21bdd4f0962d6e3b6fcdd81bb4c253)
2024-03-24 00:01:51 +01:00
deltanedas 2ffd042e9b
make suicide actions require confirming (#24609)
* add ActionAttemptEvent

* add ConfirmableAction compsys

* make suicide actions confirmable

* use new trolling techniques

* better query and dirty them

* death

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit ad3f3a5d360be6f7c8acb9c7753b45653a28cc0f)
2024-03-07 01:12:21 +01:00
LankLTE 8515da41b7
reform cooldown 10 minutes (#25328)
(cherry picked from commit 95c95006302f6d76ce9c862954723664c0850a69)
2024-02-18 23:35:36 +01:00
LankLTE e7d8f5e080
Diona Nymphs & Splitting (#24630)
* Porting & implementation

* Fix two stupid errors

* Human not humans

* fix audio path

* Fix test fails & update cooldown

* Work on reviews & test fail

* Rework nymph organ system.

* Make the nymph organs nospawn.

* IsDeadIC

(cherry picked from commit 407d4aed586a5143dc1dd0d31e7898f6df07a411)
2024-02-18 23:34:45 +01:00
deathride58 68e01e4e35
Eye opening/closing is now possible while cuffed (#24097)
u can now open and close your eyes while cuffed

(cherry picked from commit 855c08f649ce800828ae7227e094d734e3146fb8)
2024-01-26 22:51:22 +01:00
Morb 781657f44d
Tail wagging (#19573)
* MVP

* Uncomment animated prototypes

* Disable wagging on death

* Move component to server

* Looped tail animation

* Apply front tail template

* Disable animated markings globally

* Add emote sending

* Update documentation

* Move locale

* Use static instantAction & remove action on comp del

* Use fluent POSS-ADJ

* Update docs

* Add copyright

* Update copyright

* Update license & copyright

* Move to main directory & format meta.json

* Fix path

* Change namespace

* Remove empty meta.json

* Update

* REMOVE unnecessary IsNullOrWhiteSpace check

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Move animated markings to main file

* Use emotes

* new

* fix

* fix

* Tests, pls

* fix dixel

* Remove networked from wagging comp

* Remove unused import

* Remove unused imports

* Move wagging comp to shared

* Revert the emotes

If we're getting it the action is better.

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 9063cfe454263e2616d4d948648d6c73cbc039f9)
2024-01-26 22:38:24 +01:00
brainfood1183 7934940e3b
Adds Hellspawn (Nar'Sie demon mob) (#20291)
* HellSpawn Mob

* added spawner

* summary for the namespace

* larger collider, cannot enter single tile corridors.

* fix

* remove duplicate from yml, fix attributions.

* moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions

* removed flammable from hellspawn
removed the healing effect from firestarter ability (healing can be separate ability).

* Update attributions.yml

fix attributions

* fix

* fix

(cherry picked from commit b06d9cb64a53e387240fa804853d3ee2a4d3f11b)
2024-01-26 21:37:35 +01:00
Ilya246 7af4338deb
scram implant (#23122)
* implement

* fix charges

* add listing

* fixes

* fix locale, probably all done

* fix

* fix of fix

* move query init

* cleanup

* unbrokey rt

(cherry picked from commit ca529178e23c571290c5d29bfa2486ebf33d4771)
2024-01-26 21:37:33 +01:00
deathride58 6af522df55
Blindness rework - damaged eyes are now a stylized simulation of legal blindness (#23212)
* blindness rework - damaged eyes now simulate legal blindness

* hEY THATS FOR DEMONSTRATION PURPOSES ONLY AAA

* attributions

* makes eyeclosecomponent adminbus compatible

* useshader(null)

(cherry picked from commit aa6645c8e956be6abfffb58b43e67f479c45f962)
2024-01-26 21:27:55 +01:00
LordCarve 22457647a0
Add icon to Change Voice Mask Action (#23239)
(cherry picked from commit 1836bdf3ed560c9a83fc55e21a5a5b7a2e9bc8a7)
2024-01-22 21:07:33 +01:00
Whisper 59d91837e4 adds the death acidifier implant and returns the micro-bomb implant to the uplink (#22060) 2023-12-02 20:35:37 +01:00
Leon Friedrich cd2489bff4 Action container rejig (#20260)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-09-27 21:59:12 +02:00
Leon Friedrich 14182c48c7 Update engine to v162.1.1 (#20348) 2023-09-27 21:59:12 +02:00
DrSmugleaf e1ad5dc552 Remove manual localization from action entity prototypes (#20023)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-27 21:59:12 +02:00
deltanedas 24810d916b
ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
DrSmugleaf 09bce85f19
Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
DrSmugleaf c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Gotimanga 45c7cc4f5b
Hoods for Winter Coats (#19541)
* First few wintercoat hoods

* More Coat Hoods

* Cleaning up and organizing

* Maybe the coat hoods don't need their own YML file

* Tweaks and resprites

* licenses and removing pixels

* Final changes before PR

* Added sound, plus rearanging base hood

* Fixing changes I shouldn't have made while I was tired + adding custom action name

* Forgot to name the base wintercoat with hood

* Please fix the YAML test fail

* Changing a few pixels on the hoods

* Hopefully fixing testfail

* Test Fail Fix
2023-09-02 07:33:32 -07:00
Tony c764a40a69
Toggleable clothing changes (#19680)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-01 21:12:59 +10:00
Kara 5668579873
Add cooldown to bike horn implant (#19128) 2023-08-14 09:04:41 -07:00
PixelTK f189b73fe5
Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
Nemanja 98fa00a21f
Borgs (#18136)
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
Kara 7b51cebfea
Deathgasp + last words / succumbing / fake deathgasp as crit actions (#18993) 2023-08-11 22:56:34 -07:00
Nemanja 5cb4378dc3
Allow Initial Infected to turn undead while crit (#18411) 2023-07-29 00:09:53 -06:00
Arendian a39b3eddbd
New implanters for uplink (#18038)
* New implants for uplink

* made changes based on reviews

* was meant to be 3
2023-07-17 13:48:09 -06:00
Arendian 3fda7a2751
Adds Bike Horn Implants (#17548)
* Adds Bike Horn Implants

* Formatting

* Formatting

* Revert "Formatting"
Did an Oopsie
This reverts commit 62d5d87f2de59fbddf1c31db3668b174727eff0a.

* Revert last push

* Revert "Revert last push again!"

This reverts commit f12a0f597cace7fb47454762223468c597796d8d.
2023-07-09 20:44:18 -06:00
metalgearsloth 0e81cb4319
Remove diseases (#15684) 2023-05-07 17:50:37 +10:00
deltanedas 2eaec2d528
Add uplink implant (#15728)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-29 19:07:50 +10:00
Leon Friedrich 4e7cea96de
Remove speech & popups from actions (#15747) 2023-04-26 14:04:44 +10:00
mhamster 53b0996df2
[Tweak] Change sleep icon to syndie pyjama's hat (#15353)
Change sleep and wake actions icons to syndie pyjama's hat (which is more logical than just an egg)
2023-04-12 12:26:06 -06:00
deltanedas a254a4fb10 use the same priority 2023-02-24 07:32:35 +00:00
deltanedas fb3ca420bc implant locale + priority tweaks 2023-02-17 10:40:04 +00:00
Alex Evgrashin ef452b38a9
Audible emotes (#12708)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2023-01-25 08:29:41 -08:00
Jackrost 12fb4b2097
Spiders Buff and critters change (#13377) 2023-01-22 18:50:05 -04:00
Kara b170b823eb
More artifact effects (#13300) 2023-01-03 15:13:10 -08:00
Nemanja 913e1ee676
Exosuit: Ripley (#12668)
* mechs

* interaction relay

* atmos handling

* fuck around with interaction events

SPAGHETTI CODE OH MY GOD

* more sprites and whatever the hell

* more mech shit

* more shit for equipment

* starting equipment (for nukie mechs and such)

* equipment cycling

* starting with some of the ui

* a fat chunk of ui prototyping

* done tinkering with ui

* a bunch of ui stuff and what have yous

* cleaning up grabber and state handling

* make the ui actually functional + watch me port a million icons

I swear i'll prune the sprites later blease

* start on construction

* construction yo mamma

* remove some unused files

* fix a silly

* make the graph sane

* make it actually constructible.

* print the boards as well, bozo

* rebalance part prices

* eject action

also i appease the russians by remembering to localize

* Punch Shit

* make mech integrity and repairs work

* Make the UI more based

STOMP STOMP STOMP STOMP

* make equipment even more based

* batteries and other such delights

* make the ui look pimpin af

* make the construction mega based

* UI but so epic

* equipment

* some sweat tweaks

* damage rebalancing

* restructure tech

* fix some shit

* mechs inherit access

* make icons actually use sprite specifiers

* TRAILING COMMAA!!!!!

* fix a mild indentation sin

* undo this change because it isn't needed

* actually fix this

* secret webeditting shhhh

* place this tech here

* comments

* foo
2022-12-10 11:05:39 -06:00
Pieter-Jan Briers 10a99617b8
Remove usages of texture: .rsi/*.png and such. (#12896) 2022-12-06 13:11:37 +11:00
keronshb 671324bef8
Implanters and Subdermal Implants (#11840)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-11-20 17:49:37 +11:00
metalgearsloth 5c1cc5b9b3
Fix melee cuffs (#11602) 2022-09-29 23:38:24 +10:00
metalgearsloth f51248ecaa
Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
Flipp Syder 0385f1387c
Voice mask (#10458) 2022-09-29 12:22:27 +10:00
Flipp Syder 9ace52a6c1
Device link visualizer (#11054)
* shuffles devicelist to shared, adds an overlay for devicelist

* adds space property to overlay

* moves networkconfigurator to shared, makes devicelistsystem clientside check activedevicelist

* dirties components upon change, adds networkedcomponent to sharednetworkconfigurator

* state handlers for networked components

* whoops

* lots of shuffling, renaming, and access changes

* randomizes color for every new entity added to the overlay

* adds a client-side action to clear all network overlays if they're active

* clones action (oops)

* localization, adds a command for clearing network link overlays (in case the action disappears)

* moves the entity manager up into the bui fields

* makes that a dependency

* attempts to just directly get the color from the dict when drawing, now

* fixes up a few comments

* adds dirty on init to devicelistcomponent

* hacky solution related to mapping with a networkconfigurator

* more stricter bound on that hacky solution

* just checks if the life stage is initialized instead of if the entity was initialized

* moves getalldevices to shared

* readds linq import

* tries to ensure that the show button is toggled on if the device we're trying to configure is currently being tracked by the overlay

* some reorganization
2022-09-05 19:55:44 -05:00
Nemanja 3e1cf73469
Revs (the spooky ones) (#9842) 2022-08-13 23:49:41 +10:00
Nemanja 74d2864b1e
fix combat mode popup (#10523) 2022-08-13 10:27:13 +10:00
Nemanja 92eb7d58a7
Revert "Disarms now deselect after a usage. (#9290)" (#10524)
This reverts commit 90e2e44462.
2022-08-11 15:08:22 -05:00
Rane 1c8bdaf7c4
Sleeping (#9793) 2022-07-26 21:46:24 -07:00
Kara 9168fc629c
Add egg laying + chicken/duck improvements (#9518) 2022-07-09 02:48:16 -07:00