Commit Graph

5447 Commits

Author SHA1 Message Date
Whisper 0e43f90bb8
The bleed update (#14814)
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units.

* Added some comments to explain the blood and bleed code

* added some comments

* added some comments

* profusely bleeding message scales with max bleed rate

* Added some comments

* Added some comments (tm)

* Halved the speed bleed rate heals.

* Changed the wording of a comment to make the function of the values more clear

* Changed bleed rate values, made heat heal more bleed rate

* doubled crit chance, since damage types were reduced

* Made iron restore more blood, 2->4u per 1u

* Starting to add the blood pack

* add bloodlevel to healingcomponent

* Created code support in the healing system for restoring blood

* first test of blood pack prototype

* More pack testing, and defining the yml stack

* yml syntax fix

* adds bloodpack tag

* Successfully added the item, but the effect and deletion after using the item is not working yet.

* the blood regen worksgit add -A!

* blood pack is entirely functioning

* Removed bleed rate healing from brute pack

* Comment correction

* I tried

* Removed bleed stats from corrupted corgi, they inherit same stats from basemob

* Removed bleed stats from xeno, they inherit same stats from a base mob

* Removed bleed stats from diona, they inherit same stats from a base mob

* Removed bleed stats from slimes, they inherit same stats from a base mob

* All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy

* The cautery now closes bleed wounds

* Nerf blood pack bleed rate heal

* Added 2 blood packs to medicine locker

* Added 2 blood packs to wall medicine locker

* Minor YML fix to chemistry locker, no changes in game

* Added tag to medical belt for blood pack, added 2 blood packs to medical belt

* Added 1 gauze to medical belt

* 5 blood packs addded to nanomed plus

* nanomed inventory change

* 2 blood packs added to medical supplies crate from cargo

* Moved 1 gauze from med kit to advanced med kit

* Moved 1 tricord pill from advanced med kit to basic med kit

* added 2 ointment to burn kit

* Moved ina syringe from burn treatment to oxygen kit

* Removed one gauze from brute kit

* Added one bloodpack to brute med kit

* Moved tranex acid syringe from advanced first aid to brute kit

* Poison medipen moved from advanced first aid kit to toxin kit

* Removed health analyzer from advanced first aid kit

* removed one brute pack from advanced aid kit

* added one ointment to advanced aid kit

* Added one blood pack to advanced aid kit

* Added 2 blood packs to combat med kit

* Starting with adding the license for the tg sprite

* Adds the blood pack sprite and meta.json code

* I forgor to actually code the sprite in

* Advanced med kit missing one blood pack

* Replaced tricord pill with emergency medipen in cobat kit

* Removed emergency pen from combat kit, there's no space for it

* Revert "I tried"

This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0.

* Trying to fix yml test fail

* Try again

* attempt number 3

* Restock crate price was too low

* fixing merge conflict without making a HUGE mess this time

* ???

* again

* again

* Can I add the newline now maybe???

* Revert "Can I add the newline now maybe???"

This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f.

* Adds the doafter fix code from Keron to the blood level healing

* minor typo fix

* Feedback from Emisse and sloth; Removed chance based feedback on cauterizing

* comment fix
2023-04-02 23:59:51 -06:00
Kara 22db95faaa
Dwarf minor content (#15082)
* alcohol & body stuff

* vocal changes

* accent

* dumb
2023-04-02 22:28:49 -05:00
Nemanja 0f0b534239
Hunger ECS (#14939) 2023-04-03 12:42:30 +10:00
Leon Friedrich 19277a2276
More DoAfter Changes (#14609)
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
2023-04-02 21:13:48 -04:00
Pieter-Jan Briers c8e90e561b
Server ban exemption system (#15076) 2023-04-03 10:24:55 +10:00
adamsong bcb07142ae
Allow ghosts to hear radio message globally (#15078) 2023-04-02 18:56:07 -05:00
Leon Friedrich 4e978d54a4
Fix cryopod interactions (#15045) 2023-04-03 06:30:03 +10:00
Slava0135 6412289334
Make energy sword reflect projectiles and hitscan shots (#14029) 2023-04-02 23:48:32 +10:00
Moony eee96125df
Revert "Moony z level hack (#15031)" (#15032)
This reverts commit 1f6663912b.
2023-03-31 21:50:11 -05:00
Moony 1f6663912b
Moony z level hack (#15031)
* save work

* Adds Z levels

* a

* ladders + parallax scroll

* zoom out not in

* oops, sandbox

* oops i broke the law

* run ci

* fuck

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-03-31 21:49:10 -05:00
metalgearsloth b6a735774b
Add more dungeon layouts (#14924) 2023-03-30 22:54:17 -07:00
faint 8b6996cbae
DNA basics (#14724)
* DNA component

* Commit numba 2

* Added DNA into Station Records Computer

* commit numba 3

* commit numba 4

* Vomit also contain DNA component now

* fixed DNA field not clearing after scanning another item

* commit numba 10
Drinking leaves DNA on an object. Breaking glasses, bottles and beakers leave DNA and leave fingerprints/fibers with 40% chance on glass shards. + lotta fixes

* 11

* 12

* 14

* Added DNA guide entry

* FIX
2023-03-30 22:49:25 -06:00
metalgearsloth 40deda74ab
Fix docking config in some instances (#15005) 2023-03-31 15:45:14 +11:00
metalgearsloth ce34252cd3
Revert "fuckyou (#14960)" (#15006)
* Revert "fuckyou (#14960)"

This reverts commit e29c54d64e.

* Use volume for it
2023-03-30 22:44:39 -06:00
metalgearsloth cefc37903e
Random emergency shuttle time (#10047)
* Random emergency shuttle time

60 to 180 seconds. Rounds up to nearest 10.
All other FTL will go to the default of 30s.

* fix
2023-03-30 22:20:43 -06:00
Leon Friedrich 59eb53d4f7
Fix resource &prototype upload recording (#15003) 2023-03-30 22:55:06 -05:00
metalgearsloth 763089570d
Make trays clientside (#14826) 2023-03-31 14:40:38 +11:00
Nemanja 3c6e67adee
addcurrency command (#15000) 2023-03-30 23:02:39 -04:00
Moony 5cc78c2c75
Revert "Oops, All Captains! (#14943)" (#14994)
This reverts commit 8128759ea8.
2023-03-30 18:55:09 -05:00
Skye 8128759ea8
Oops, All Captains! (#14943) 2023-03-30 18:54:38 -05:00
Leon Friedrich 7f524f6751
Fix high pressure protection (#14968) 2023-03-29 16:45:56 -07:00
metalgearsloth f6b5fbca6a
Add protectedgrid to emergency shuttles (#14946) 2023-03-29 18:48:32 +11:00
Nemanja 66ff565e16
Add support for true randomized characters (#14918) 2023-03-28 18:30:00 -07:00
Dawid Bla b6c2a7ca47
Fixed godmode persisting (#14934) 2023-03-29 10:59:59 +11:00
DrSmugleaf ed45440256
Always show ahelp relay message when the relay is enabled (#14931) 2023-03-28 14:27:21 -07:00
jjtParadox 5c129c49da
Fix Bureaucratic Error event affecting fewer jobs than intended (#14921) 2023-03-28 06:58:13 -05:00
Nemanja 62e5ef8041
Fix foldable mispredict (#14919) 2023-03-28 16:43:36 +11:00
0x6273 25c89539ba
Fix door remote not updating airlock lights (#14903) 2023-03-27 22:05:57 -07:00
metalgearsloth a0e7ce2005
Add PreventPilot to arrivals source (#14899) 2023-03-28 00:25:27 +11:00
Leon Friedrich 36f7a5b0e6
Rename WorldMap to MapId (#14857) 2023-03-27 22:40:57 +11:00
Flipp Syder 626dfa05cd
Adds arrivals blacklist (#14882) 2023-03-27 12:53:27 +11:00
Leon Friedrich 87185d019c
Fix auto-emote bug (#14883) 2023-03-26 17:47:46 -07:00
Tyzemol 6476474205
Belt and back slot quick draw (#14828)
* backgunquickequip

* backgunquickequip

* fix build fail

* fix build fail 2

* cleanup

---------

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
2023-03-26 16:01:09 -07:00
Leon Friedrich 4d71b1b81e
Revert "Mind ecs" (#14881) 2023-03-27 08:24:00 +11:00
TemporalOroboros c6c8fa2075
Resolves MedicalScannerVisualizer is Obsolete (#13893) 2023-03-26 15:26:00 -04:00
ShadowCommander bfc4da9377
Mind ecs (#14412) 2023-03-26 14:31:13 -04:00
metalgearsloth d2cf1b8d5d
Shrink clearance for dungeon doors (#14656)
* Shrink clearance for dungeon doors

I tried adjusting it on engine but it was leading to test assertions on content which scared me.

* a

* comment
2023-03-26 12:07:49 -05:00
metalgearsloth a8130f177f
Fix static pricing for stacks (#14865)
Removed BaseItem price as it was always a placeholder and easier to just change without it.
Ensure staticprice is never used if stackprice is present.
Added StackComponent to the test so the behavior matches expectation.
2023-03-26 12:01:42 -05:00
Nemanja 930d097616
NukeOps start with either station codes or their codes (#14025)
* NukeOps start with all nuke codes

* make it pick a random code

* clarify this
2023-03-26 11:58:57 -05:00
metalgearsloth 492a361dd9
Prevent really latejoins from being T (#14866)
AKA if they're still on arrivals and either padded time or got lucky with timing.
2023-03-26 08:17:38 -05:00
keronshb a92b67b10d
Cardboard Boxes will play effect & sound again (#14859) 2023-03-26 13:26:39 +11:00
deltanedas 3cd30c408b
add signal valve (#14830)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-25 16:16:27 -07:00
deltanedas 27e5fe5767
pneumatic cannon fixes (#14705)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-25 16:15:46 -07:00
brainfood1183 ba3de94c73
Monkey can wear breath mask and smoke a blunt (#14612) 2023-03-25 15:59:48 -07:00
Kara 4ba9e8090d
Minor entitystorage air fixes (#14842) 2023-03-25 15:30:19 +11:00
Mr0maks bda78dab60
Fix force climbing DoAfter (#14736) 2023-03-25 15:12:47 +11:00
Menshin 735701d915
Alert display lights now properly react to power changes. (#14839) 2023-03-24 20:10:48 -07:00
dontbetank 5de921b923
Books localization (#14813) 2023-03-24 17:27:30 -04:00
Slava0135 81159b0ff5
better fluid spreading (#14529) 2023-03-25 01:09:52 +11:00
Leon Friedrich 473a02120d
Map-Init guidebook entities. (#14823) 2023-03-24 20:00:29 +11:00