Commit Graph

15156 Commits

Author SHA1 Message Date
Morb
fc61b9da62 Use string for arrivals map cvar (#15104) 2023-04-03 22:25:31 +10:00
PJBot
43f35a32f0 Automatic changelog update 2023-04-03 03:51:37 -04:00
Whisper
0f8764725b Changelog fix for bleed update (#15093)
* Changelog fix

* More defined stuff in CL
2023-04-03 01:51:24 -06:00
Whisper
1dbc75abd5 new bloodpack sprite (#15095) 2023-04-03 01:50:32 -06:00
PJBot
ffe373d6da Automatic changelog update 2023-04-03 02:43:41 -04:00
Puro
4443850de3 [Drink] Robust nukie drink (#15051)
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end
2023-04-03 00:42:37 -06:00
PJBot
c04fe384d8 Automatic changelog update 2023-04-03 02:28:49 -04:00
Puro
3c56ecda87 [Access] Fire axe cabinet (#15021)
* [Access] Fire axe cabinet

* fix fireaxe_cabinet.yml
2023-04-03 00:27:45 -06:00
potato1234_x
a42a2f8021 High-capacity welding fuel tank (#15019)
* high capacity fuel tank

* nerf that explosion holy shit

* e
2023-04-03 00:26:57 -06:00
PJBot
3a58ab878a Automatic changelog update 2023-04-03 02:26:18 -04:00
crazybrain23
71caa87890 blood-red please (#15020) 2023-04-03 00:25:53 -06:00
Puro
88f0b3d4ed [Clothing] watermelon helmet (#15025) 2023-04-03 00:25:14 -06:00
PJBot
c1a700b88b Automatic changelog update 2023-04-03 02:24:33 -04:00
lzk228
37cbe4cc0b Scientific beret (#15042)
* Added scientific beret

* Added scientific beret

* Scientific beret added to RD's locker
2023-04-03 00:23:29 -06:00
PJBot
19a033da6e Automatic changelog update 2023-04-03 02:21:19 -04:00
Lei Yunxing
edef526a37 Adds holobarrier projector to warden and HOS lockers (#15091)
* adds holobarrier projector and adds it to warden&hos locker

* a
2023-04-03 00:20:15 -06:00
PJBot
2aa85fefc2 Automatic changelog update 2023-04-03 02:00:55 -04:00
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
PJBot
793df1ce89 Automatic changelog update 2023-04-03 01:47:32 -04:00
metalgearsloth
e33b178f62 Remove interior shuttle drawing (#15090) 2023-04-03 15:46:28 +10:00
PJBot
7797831226 Automatic changelog update 2023-04-03 01:32:32 -04:00
Kara
fbf8f53977 Update submodule (#15089) 2023-04-02 22:31:28 -07:00
PJBot
4b5659144a Automatic changelog update 2023-04-03 00:54:29 -04:00
Leon Friedrich
6e1fa57155 Fix instant awaited DoAfters (#15088) 2023-04-03 14:53:24 +10:00
Leon Friedrich
3dbd581382 Fix MovespeedModifierMetabolism state handling (#15084) 2023-04-03 13:31:00 +10:00
Kara
22db95faaa Dwarf minor content (#15082)
* alcohol & body stuff

* vocal changes

* accent

* dumb
2023-04-02 22:28:49 -05:00
PJBot
f1e6bb39ff Automatic changelog update 2023-04-02 22:59:56 -04:00
metalgearsloth
79d50a2f3e Update submodule to 0.96.1.0 (#15083) 2023-04-03 12:59:02 +10:00
Visne
ff759845f6 Add keybindings for removing a word at a time (#13644)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-04-03 12:58:52 +10:00
PJBot
98bb8af79a Automatic changelog update 2023-04-02 22:46:45 -04:00
Puro
3319666c58 [Cargo crate] Crate for theatrical performances (#15072) 2023-04-03 12:45:41 +10: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
9e66fac805 GDPR helper scripts stuff (#15077) 2023-04-03 10:27:45 +10:00
Pieter-Jan Briers
c8e90e561b Server ban exemption system (#15076) 2023-04-03 10:24:55 +10:00
PJBot
e037d12899 Automatic changelog update 2023-04-02 20:07:28 -04:00
Emisse
83b342ab5f Re Enable Dwarves (#15079) 2023-04-02 17:06:24 -07:00
PJBot
a07cae0d23 Automatic changelog update 2023-04-02 19:57:11 -04: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
Mr0maks
1bd3e54dae Fix plastic wall deconstruction graph (#15056) 2023-04-03 05:47:54 +10:00
Zoldorf
ebb612446a Changes the SingularitySystem to use generic visualizers (#15057) 2023-04-03 05:46:46 +10:00
PJBot
a69ed4d177 Automatic changelog update 2023-04-02 15:36:00 -04:00
Ilya246
b6bb4075f8 stealth (#15073) 2023-04-02 13:34:56 -06:00
PJBot
d48f0c562d Automatic changelog update 2023-04-02 10:09:19 -04:00
metalgearsloth
984dbc9a00 Fix fly-by sound leak (#15070) 2023-04-03 00:08:15 +10:00
PJBot
44f140a4e2 Automatic changelog update 2023-04-02 09:49:41 -04:00
Slava0135
6412289334 Make energy sword reflect projectiles and hitscan shots (#14029) 2023-04-02 23:48:32 +10:00
Emisse
b8014bc8af meta station (#15064) 2023-04-02 02:18:43 -06:00
Emisse
5915be8eef omega bells fsdajoff (#15063) 2023-04-02 02:14:17 -06:00