Commit Graph

20 Commits

Author SHA1 Message Date
AJCM-git 6b7e8b4f5b
UseDelay + ItemCooldown merge (#22502)
(cherry picked from commit 9c522c8b19f7a6f6b396c66342413572a22d7845)
2024-01-26 21:32:09 +01:00
Nemanja 6e8c4009b4
Fix defibs resetting rot timer + slimes not having perishable (#23340)
* Fix defibs resetting rot timer + slimes not having perishable

* fix the sound too

(cherry picked from commit 8d9a76c95d25e5bc26c897e61ec9702141afed7a)
2024-01-23 22:53:17 +01:00
Leon Friedrich adee2a7465 Fix various errors/exceptions (#22841)
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
2023-12-22 23:25:06 +01:00
Kara a23dce4702 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-22 23:12:06 +01:00
metalgearsloth b1ee2d48ff Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
Nemanja f2b749bd31 Fix borg mobstates (#21307)
* Add dead states to borgs

* this?

* ack
2023-11-12 20:52:59 +01:00
Nemanja 27624ad280 Speed Boots [Tier 3 Civ-Service] (#21438)
* Speed Boots

* validate

* monkey
2023-11-12 20:48:04 +01:00
Leon Friedrich e66c0b5035 Un-revert IPlayerManager refactor (#21244) 2023-10-31 19:00:44 +01:00
Raphael Bertoche e55c41a878 Removes unnecessary message for defibbing a patient which has ghosted (#20690)
* Removes unnecessary message for defibbing a patient which has ghosted

This message is for the defib operator.

It could inform them that the patient doesn't have a consciousness since it's ghosted
but maybe no message is really the right move here because it may have succeeded
and that would be what would happen had the defib attempt succeeded - no message.

Also when the patient's ghost return to body there they will be alive as long as the
body is still alive, so telling the operator to defib again may be wrong.

* Removes corresponding ftl message which doesn't occur now
2023-10-08 19:58:47 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
DrSmugleaf 3f3ba6ac62
Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
DrSmugleaf 15c0211fb2
Refactor minds to be entities with components, make roles components (#19591)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07:00
Pieter-Jan Briers 7e5d03a1a8
Fix defib "return to body" prompt. (#18376) 2023-07-27 15:13:17 -04:00
ShadowCommander dd7032a860
Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Nemanja 19742f72b1
Fix defibs not reviving (#17195)
* defib tweaks

* fix defibs not actually reviving
2023-06-07 13:12:49 -06:00
Nemanja 409462df7f
defib tweaks (#17167) 2023-06-06 15:08:34 -06:00
Nemanja f53eae9a2c
fix game not building (#16097) 2023-05-04 16:40:47 -07:00
Nemanja b16eba534a
[fix] Fix rotting (#16039)
* Fix rotting

* empty
2023-05-02 22:57:47 -06:00
metalgearsloth c7c083e9c8
Defib fixes (#16031) 2023-05-03 11:32:06 +10:00
Nemanja 0604c93d50
Defibrillator (#15922)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:10:19 +10:00