juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,963 Commits 57 Branches 0 Tags
29e48d3e27991f24ca412cab49ec6802aa3bfa18
Commit Graph

6969 Commits

Author SHA1 Message Date
Ed
0f8c004a2f Teslaloose and Singuloose counterplay (#23444) 
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

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

* Update Resources/Locale/en-US/research/technologies.ftl

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

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-01-04 18:48:09 -08:00
metalgearsloth
7c66bebbef Revert "Revert "Electric anomaly rework"" (#23549) 
Revert "Revert "Electric anomaly rework" (#23546)"

This reverts commit 9acbe38e53.
 2024-01-04 21:14:10 -05:00
Emisse
9acbe38e53 Revert "Electric anomaly rework" (#23546) 
Revert "Electric anomaly rework (#23173)"

This reverts commit 05ee6eb308.
 2024-01-04 17:35:24 -07:00
Jezithyr
c242e05cde Created Proximity Detection and Beeper Systems (#23177) 2024-01-04 15:56:23 -08:00
Bakke
a9b797a091 Fix robusted dionas not being recoverable (#21636) 
* Fix robusted dionas not being recoverable

* Implement a polymorph cooldown field, used for TreeMorph

Allows the polymorphed Diona some time to work off robust harvest
without immediately polymorphing again.

* Minor adjustment to polymorph cooldown timing

* Apply suggestions from code review

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

* fix: trigger polymorph revert on destruction

As suggested by mirrorcult, DamageThresholdReached is not the ideal
candidate for reverting a polymorph on destruction, as there exists a
DestructionEventArgs to listen for instead.

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-01-04 06:10:04 -07:00
VMSolidus
84a2356831 Adding PAI Slot to PDA (#21086) 
* Adding PAI Slot to PDA

* Update PdaComponent.cs

* Update pda.yml

* Update tags.yml

Sorting it alphabetically

* Adding PDA UI Elements.

* Addressing reviews

* Update PdaComponent.cs

* Update Content.Shared/PDA/SharedPdaSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update Content.Shared/PDA/SharedPdaSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/pda.yml

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update PdaComponent.cs

* Update PdaComponent.cs

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
 2024-01-04 05:56:14 -07:00
brainfood1183
b06d9cb64a 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
 2024-01-04 05:53:15 -07:00
Ilya246
ca529178e2 scram implant (#23122) 
* implement

* fix charges

* add listing

* fixes

* fix locale, probably all done

* fix

* fix of fix

* move query init

* cleanup

* unbrokey rt
 2024-01-04 05:38:02 -07:00
metalgearsloth
f84cd9c48a Pathfinding stuff (#23516) 
Won't fix any crashes
 2024-01-04 05:33:56 -07:00
Emisse
dfec6a4ac9 make flashes use audio range (#23521) 
make flashes use range
 2024-01-04 23:27:32 +11:00
SpeltIncorrectyl
082bde40ca The Flatpacker 1001 can now make flatpacks for computers. (#23471) 
* moved ComputerBoardComponent to Content.Shared

* made flatpacker accept computer boards

* made flatpack system and ui function with computer boards

* fixed it so that flatpacks of computers are correctly coloured to fit their computer board colour

* unhardcoded the computer flatpack assembly cost

* Combined GetFlatpackCreationCost(...) with GetflatpackCreationCostForComputer(...)

* removed code duplication in SharedFlatpackSystem

* removed code duplication from FlatpackCreatorMenu.xaml.cs

* remove code duplication from FlatpackSystem (on the server)

* fixed indentation error
 2024-01-03 23:23:47 -05:00
metalgearsloth
f533a1a543 Add RoomFill markers (#22293) 
* Add RoomFill markers

* weh

* Also deez

* Working

* Randomised fills working

* Fixes

* Fix lack of prototypes

* Fix tests

* Fix tests?
 2024-01-04 15:17:04 +11:00
metalgearsloth
a3516e60e7 Small adjustment for elookup api (#22447) 
* Small adjustment for elookup api

* fix
 2024-01-04 15:13:19 +11:00
metalgearsloth
3ee6b8d2bc Fix biome marker dupes (#23500) 2024-01-04 15:04:43 +11:00
Leon Friedrich
9f2535a130 MakesGameTicker use FlushEntities() (#23299) 2024-01-04 14:33:43 +11:00
metalgearsloth
bf79acd127 Salvage magnet revamp (#23119) 
* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge
 2024-01-04 14:25:32 +11:00
Leon Friedrich
377be6fcca Changes required for frozen event bus PR (#23493) 
* Changes required for frozen event bus PR

* Fix RoundEndTest
 2024-01-04 13:26:25 +11:00
metalgearsloth
002d749c7e Minor biomes change (#23494) 
Maybe fixes void if there's exceptions, idk
 2024-01-04 13:04:14 +11:00
AJCM-git
9c522c8b19 UseDelay + ItemCooldown merge (#22502) 2024-01-03 21:33:09 -04:00
themias
7c22a1cc59 Increase zombie prying time for bolted doors (#23383) 2024-01-03 17:41:39 -07:00
deathride58
4d0d2e4c5a Kobold variety - allows kobolds to have random colors and horns (+ allows RandomSpriteComponent to uh. Actually choose random sprites for specific layers) (#23393) 
* kobold variety - allows kobolds to have random colors and horns

* hey lets maybe not crash in this case, lets maybe let the color continue being null in this case

* excuse us vscode what the fuck is this

* brightens kob base, makes kob outline more bold, fixes to the prototype because our code spaghett

* okay yeah angler horns just dont work At All. the floppy kobold ears, however? MWAH. chef's kis

* we've been staring at these critters all day - makes base color line up with the base color of some of the markings
 2024-01-03 17:39:00 -07:00
themias
53f18e8e91 microwave ejection tweak (#23460) 2024-01-03 17:36:31 -07:00
Nemanja
4662d463b8 Chill bounties + fixes (#23411) 
* Chill bounties + fixes

* localize

* fix arbitage
 2024-01-03 17:34:47 -07:00
Leon Friedrich
9bff44d141 Replace EntityUid parsing with NetEntity (#23474) 
* Replace EntityUid parsing with NetEntity

* fix

* Other changes required for arch

* And anothher
 2024-01-04 11:04:31 +11:00
lzk
59e758ae2a Vendors now will say "Thanks for using!" (#23023) 
* comit1

* comit2

* comit 3

* Update Content.Server/VendingMachines/VendingMachineSystem.cs

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-01-03 17:21:53 -05:00
themias
0235b196dc refueling lit welder explosion fix (#23469) 
* refueling lit welder explosion fix

* add DamgeOnToolInteract to wall dispenser
 2024-01-03 16:23:36 -05:00
deathride58
aa6645c8e9 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)
 2024-01-03 01:07:02 -08:00
Mr. 27
0e18d54cf7 head revolutionaries are now blue (#23432) 
* inital2

* raemove break
 2024-01-03 19:32:38 +11:00
metalgearsloth
9f47079d02 Fix remote solution injection (#23429) 
Checks if its own fixture is hard so the fly-by fixture can't also proc it.
 2024-01-03 18:57:36 +11:00
DrSmugleaf
bc304a3127 Fix another error on round restart when terminating spreaders (#23201) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-03 18:57:28 +11:00
themias
e7d1302357 Fix a few cyborg interactions (#23391) 
Fix cyborg interactions
 2024-01-03 17:31:58 +11:00
metalgearsloth
2166958bd0 AutoCompState + ItemToggle fixes (#23422) 
* AutoCompState + ItemToggle fixes

Fix a lot of the comp states that are never actually networked and also cleaned up ItemToggle events a bunch. ItemToggle will still need some future work for lights and sounds.

* Also catch these
 2024-01-03 17:24:02 +11:00
Nemanja
1c11332fa4 Flatpacks and the Flatpacker 1001 (#23338) 
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename
 2024-01-03 17:16:02 +11:00
778b
439d6ff44e Fixed mice behavior of eating everything (#23322) 
* Added precondition for EatTask

* Added Thirsty precondition for htn drink task

* Added start state for hungry and thirsty components

* Update nutrition.yml

* Fixed pascalcase's
 2024-01-02 13:49:20 -05:00
Trevor Day
207ca6f423 Add admin logs for drawing with syringe. (#23333) 
Add logs for drawing with syringe.
 2024-01-02 13:47:31 -05:00
Skye
fbe72c848a ChemMaster buffer preserves list ordering (#23352) 
ChemMaster now maintains list order on reagent removal
 2024-01-02 10:51:21 -05:00
Ilya246
49dbbc5721 fix emagged lathes (#23318) 
* implement

* pass uid

* fix

* fix dementia

* event implementation

* fix
 2024-01-02 02:11:13 -05:00
Nemanja
719b44f1ce Fix all objectives on end screen being bolded (#23345) 
fix all objectives on end screen being bolded.
 2024-01-02 17:19:41 +11:00
Nemanja
2988d60bd4 Fix anti-anomaly zones (#23357) 2024-01-02 17:18:41 +11:00
Nemanja
8d9a76c95d Fix defibs resetting rot timer + slimes not having perishable (#23340) 
* Fix defibs resetting rot timer + slimes not having perishable

* fix the sound too
 2024-01-02 13:12:32 +11:00
Ed
77cc81d376 Anti Anomaly zones (#23187) 
* add

* its work now

* pipi

* Update Content.Server/Anomaly/AnomalySystem.Generator.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* fix ()

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-01-01 17:30:05 -07:00
deathride58
0ffd4e953e Adds current panic bunker status to the server's /status API (#23330) 
allows the server to advertise its current panic bunker status
 2024-01-01 17:16:03 -07:00
Łukasz Mędrek
3a7fda10df Fix reptilians pulling after being zombiefied (#23066) 
* Fix reptilians pulling after being zombiefied

Now being zombefied removes ability to pull objects, regardless of if
the entity could pull without using their hands.

Fix #23043

* Apply changes from review
 2024-01-01 18:31:36 -05:00
Ed
05ee6eb308 Electric anomaly rework (#23173) 
* add content

* remove using

* update

* Update ElectricityAnomalyComponent.cs

* 2-5 lightnings

* tweaks

* remove tesla comment (sorry)
 2024-01-01 02:24:38 -08:00
Ed
5e1fcfc63e Major Tesla tweaks (#23235) 
* add ignore chance

* twekas

* add damaging and repairing

* grounding rod undestructable by tesla
 2023-12-31 23:33:48 -08:00
Nemanja
2b01899d63 Make the material ejection control completely generic (#23308) 
* Finish decoupling material ejection from lathes

* commented
 2023-12-31 23:16:25 -08:00
Nemanja
ad5f7a5c76 Give throwing a cooldown (#23311) 2024-01-01 14:24:37 +11:00
LankLTE
e76d8390bd add cvar for custom panic bunker reason (#23267) 
Panic bunker cvar
 2023-12-31 21:53:49 -05:00
Rainfey
3ea7c5e4f7 Ensure correct number of thieves are selected (#23270) 
Fix thief selection

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
 2023-12-31 21:25:28 -05:00
Ed
bf7aa47b32 More artifact content (#22574) 
* 3 new effect

* new trigger

* swap portal to Cak

* cake

* portals

* finish

* pupupu

* limitations (same maps)

* its broken now

* a

* portal fix, thx deltanedas
 2023-12-31 21:19:03 -05:00