juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,652 Commits 57 Branches 0 Tags
581ca2f5efefe8aeb53397af1f02bdf52012abea
Commit Graph

92 Commits

Author SHA1 Message Date
Ed
ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
 2025-04-30 20:31:50 +03:00
Ed
5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync 
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
 2025-04-15 00:44:29 +03:00
Pieter-Jan Briers
843d79be5f Fire extinguishers can now extinguish items, including when held/worn (#36267) 
* Fire extinguishers now put out candles

This did not actually require any changes to flammable or extinguishers directly, the only necessary changes were to make the collision actually work.

Vapor entities (also used for fire extinguishers) now have a collision layer, so they can hit items.

Added a new FlammableSetCollisionWake component to actually enable collision on candles while they are lit, because otherwise CollisionWake on entities gets in the way too.

* Extinguishing items is now relayed to held/worn items

This means held candles get extinguished too.

Involved moving the core logic of ExtinguishReaction into an event so that it can be relayed via the existing hand/inventory relay logic.

* Add helper functions for subscribing to relayed events.

Use these in FlammableSystem

* Make extinguishers work on cigarettes too

A bunch of renaming to make the rest of my code work with SmokableComponent

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2025-04-14 19:00:47 +10:00
slarticodefast
50bbb1c101 predict IgnitionSourceComponent (#36310) 
* PREDICTION

* comment

* don't overwrite event args

* totally not a web edit

* intn't
 2025-04-06 17:54:47 -07:00
Ed
373d3a892b New Comoss island map (#618) 
* Create island_new.yml

* first map state
 2024-11-30 01:08:44 +03:00
Ed
66fe15f8c7 Balance tweaks (#604) 
* x2 damage

* Update CP14MagicWeaknessSystem.cs

* split cure burn

* split blood purification

* extinguish torch by interact

* Update torch.yml

* Update T0_cure_heat.yml

* fix fireSpread
 2024-11-22 14:14:22 +03:00
Ed
96fc06a443 Fire update (#602) 
* fire spread fixes and optimization

* fix liquid drops nefty and suffix

* some sharedization

* melee fire extinguish

* clean up fireSpread system

* caution popup

* cuffable zombies

* fix zombie AI

* lighter

* torch integration attempt

* fix torch igniting

* yml tweaks

* bonus flammable damage
 2024-11-21 22:01:14 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
Ed
5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
 2024-09-08 21:20:54 +03:00
Ilya246
447e9c247d fix flammable reagents deigniting you (#31930) 
fix
 2024-09-07 17:44:58 -06:00
Ed
97939f6e3e Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-08-08 12:29:20 +03:00
Nemanja
ce97225c2d Replace IClickAlert with events (#30728) 
* Replace IAlertClick with events

* whoop

* eek!
 2024-08-07 15:15:35 +10:00
Ed
6a5fae3403 Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream 2024-06-02 11:01:34 +03:00
Nemanja
a1a8f04036 Decouple interactions from hands, cleanup old events, add new fears (#28393) 
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
 2024-05-31 13:26:19 -07:00
Ed
afb1acab10 Fix candles (firestack fading) (#28139) 
Update FlammableSystem.cs
 2024-05-25 16:22:34 -04:00
Ed
e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream 
# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-05-25 18:49:49 +03:00
Nemanja
8a95cb186c Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158) 
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
 2024-05-19 15:40:28 +03:00
Ed
918ba35ccb Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream 2024-05-17 12:57:04 +03:00
deltanedas
bad5367479 fire troll fix (#28034) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-14 16:47:00 -07:00
deltanedas
4b2193a8a0 fix fire spread round removal (#27986) 
* fix a resolve debug assert

* rewrite fire spread

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-13 17:49:44 -04:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
 2024-05-13 18:32:59 +03:00
deltanedas
cd92046966 make fire not burn through hardsuits (#27161) 
* add FireProtection system and event

* minor optimisation + make flammable use fire protection event

* add fire protection values to some things, nerf firesuit heat resistance

* bruh

* unrevert laser nerfs, make elite hardsuit fully fireproof

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-09 00:12:48 -07:00
Ed
2c34befbcb Fireplace (#123) 
* bonfire!

* fix

* update torch

* docs

* add audio, fix errors

* loc string + fix errors
 2024-05-01 19:55:48 +03:00
Ed
057556b605 Merge remote-tracking branch 'space-station-14/master' into ed-26-04-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
 2024-04-26 00:33:04 +03:00
Whisper
eee056eaf0 lower max firestacks to 10, refactor flammable (#27159) 
* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage
 2024-04-23 21:30:01 +10:00
deltanedas
fcf5057b61 make fire spreading scale with mass (#27202) 
* make fire spreading scale with mass

* realer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-04-22 01:42:26 -07:00
Ed
af734dc5c2 fixes 2024-04-20 12:45:25 +03:00
Ed
0bc1c31193 КОСТЁР (#22) 
* респрайт костра, новый костёр

* fix itemheating

* этот костер потребовал слишком много работы

* перекрас травы
 2024-04-03 00:48:08 +03:00
LankLTE
407d4aed58 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
 2024-02-16 18:54:44 -08:00
Pieter-Jan Briers
3e3cb10a96 Make some damage sources not cancel do afters (#24635) 
- poison chemicals (HealthChange effect)
- being on fire
- guardians transferring damage to owner
 2024-01-28 10:51:54 +11:00
Arendian
6bf6994298 Incendiary projectiles and lava firestack reduction (#23479) 
* Firestack reduction and FireStackOnHit added

* Slight lava tweak

* Remove component and tweaked incendiary pellets

* Incendiary grenade tweak

* Now ignites on projectile fixture or ignition fixture + incendiary grenade tweak

* flare shells now  ignite entities again

* Comment

* undo flare gun ignite
 2024-01-08 00:41:42 -05:00
AJCM-git
9c522c8b19 UseDelay + ItemCooldown merge (#22502) 2024-01-03 21:33:09 -04:00
Nemanja
cfb129c5a4 Buff heat and flame damage (#23238) 2023-12-30 16:28:00 -07:00
qwerltaz
2fe1164a03 flammable entities hotfix (#23113) 
* flammable fix

* move air check and ignition to if statement
 2023-12-28 18:28:15 -05:00
qwerltaz
3f91028395 Fix flammables air ignition (#23063) 
* Fix welder ignition

* fix mobs on fire hotspot expose frequency

* fix shotgun pellets ignition

* ensure ignitionComp on flammable init

* \n

* Revert "ensure ignitionComp on flammable init"

This reverts commit 6915dcdc
 2023-12-27 20:05:50 -07:00
Leon Friedrich
10142c3a2e Rebalance fireaxe (#22731) 
* Rebalance Fireaxe

* Nerf it a bit
 2023-12-18 21:41:33 -05:00
metalgearsloth
269c93245d Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Leon Friedrich
16a96976d3 Flammable system bug fixes. (#21594) 2023-11-14 22:55:45 +11:00
Ed
aa713ea7e6 Candles (#21087) 
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
 2023-11-03 22:53:51 -07:00
DrSmugleaf
f560f88eb5 Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
Kara
77964d4a6b Kill SharedEntityExtensions and all popup extensions (#20909) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-10-16 16:56:09 +11:00
metalgearsloth
735626654a Remove FixtureId (#19280) 2023-08-23 18:55:58 +10:00
mhamster
5ce47fbb03 Add ability to burn papers +Flammable tweaks. (#18955) 2023-08-14 15:45:55 -04:00
Chief-Engineer
bfa3989011 improve ignite logs (#18669) 2023-08-05 12:18:09 +10:00
Leon Friedrich
2bd5fb3736 Remove obsolete Fixture.Body references (#16259) 2023-05-09 17:21:26 +10:00
metalgearsloth
06efff2b2d Flare gun 1984 (#15807) 2023-05-04 12:46:02 +10:00
Chief-Engineer
017fb28ce3 Add atmos ignition logs (#14216) 2023-02-28 16:43:24 -04:00
Visne
5a5a3afbb1 Remove some obsolete AppearanceComponent method usages (#13726) 2023-02-02 12:34:53 -04:00
metalgearsloth
bf79d76666 Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00