Commit Graph

6183 Commits

Author SHA1 Message Date
Ed
22bb0ae283 Energy pilons WIP (#326)
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
2024-07-29 21:01:36 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
2024-07-28 20:58:48 +03:00
Ed
655b32b720 Magic spells backend (#358)
* add EntityEffect aability support

* delayed actions

* renaming

* delayed projectile spells

* spawn on self + entityEffect on self spells

* spawn on point spell

* rename

* clean up base species components

* magic alert

* move magic energy to Shared, add manacost to spells

* magic recoil

* improve magic recoil

* verbal aspect

* somatic aspect

* add simple vfx proto and sprites

* add casting VFX

* add TODO
2024-07-28 17:26:47 +03:00
Jona-K
2951ea2bee Adjustet MobBaseAncestor class (#30424) 2024-07-28 01:32:26 -07:00
lzk
e1e2d26969 Fix pancakes stacks (#30270)
Fix pancakes
2024-07-28 13:49:06 +10:00
metalgearsloth
093054f7e3 Move vgroid much closer (#29943)
* Move vgroid much closer

General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.

* Decrease max

* Tweaks

* godzilla

* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
2024-07-28 13:14:18 +10:00
Brandon Hu
3283424ba8 tweak(Radiation Suits): Increase damage taken by 1000% (#30392)
wtf is 0.9% anyways
2024-07-28 02:10:07 +03:00
Brandon Hu
54e42cc4e5 tweak(NuclearBomb Keg): Give the nuclear bomb keg a hit box (#30415)
* bleh

* Bugs spread disease :(

* they are reproducing

* no lore
2024-07-27 21:45:53 +01:00
Brandon Hu
dc1be42b8f tweak(Chemical Dispenser): Give the chemical dispenser a hitbox (#30412)
weh
2024-07-27 21:47:38 +03:00
BombasterDS
de7df2a760 Some plant mutations (#28993)
* Some new plants mutations

* glasstle inhand

* gapple trico increase ↑

1-10 to 3-16

* replace trico with doc delight
2024-07-27 18:08:49 +03:00
Golden Can
1149290825 Security Clown Mask (#30249)
Added Security Clown Mask available from hacked SecDrobes.
2024-07-27 00:09:23 -04:00
Brandon Hu
b1d5436bcd fix(ExtinguisherCabinet): Fix cabinet whitelist to allow fire extinguishers again (#30371)
ugh

Co-authored-by: Avery Dobbins <avery.dobbins@gmail.com>
2024-07-26 14:46:40 -04:00
Cojoke
333bb386d9 Add Identity Blocker to a Couple Things (#30305) 2024-07-25 23:26:04 -06:00
Ilya246
d5236d8236 give nukie reinforcements full operative gear (#30173)
* rebase master

* free fish

* introduce recommended changes

* fix prototypes

* fix protos yet again

* fkhsdjbhehbo;ehb

* rafle
2024-07-25 16:37:54 -07:00
Plykiya
7388b91ef5 Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)
* NOW THAT'S A LOT OF FILES

* categorization

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-25 05:24:00 -07:00
timur2011
bcd7a7ad00 Space adder now butcherable, snake drops snake meat (#29629) 2024-07-25 03:52:18 -07:00
lzk
f56e4f6624 Replace some to do with TODO (#30346)
Replace to do with TODO
2024-07-25 11:04:03 +03:00
deltanedas
8de6b74e08 fix borg light being on by default (#30342)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-24 23:30:17 -06:00
deltanedas
8f6326c3e0 prevent borgs unlocking eachother and robotics console (#27888)
* prevent borgs from using locks

* e

* bru

* a

* blacklist borgs and robotics console

* frogro

* add IsAllowed to EntityWhitelistSystem

* use IsAllowed

* move thing to new LockingWhitelistSystem

* :trollface:

* review

* use renamed CheckBoth in locking whitelist

* remove unused stuff and add more to doc

* Use target entity instead to remove self check

* Rename to _whitelistSystem

* Add deny lock toggle popup

* Prevent duplicate checks and popups

* Fix wrong entity in popup when toggling another borg

* Make new event

* Update comment to user for new event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-25 13:54:51 +10:00
marbow
b6811d3570 Medical borg add chem glasses (#27843)
* Update borg_chassis.yml

* Update borg_chassis.yml

* fix

* Removing unnecessary components and adapting changes (#28391) for the syndicate

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-25 13:49:32 +10:00
Brandon Hu
343496faf8 tweak(chameleon): Add clown suit to chameleon tech (#29307) 2024-07-24 02:04:20 -07:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116)
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
2024-07-23 16:22:11 -07:00
Ko4ergaPunk
e7aa97645b Change drawdepth of some wall-mounted objects (#30274)
drawdepth
2024-07-23 17:41:15 +03:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
2024-07-23 12:24:42 +03:00
Ed
918709cb47 Displacement maps big update (#30093)
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
2024-07-23 12:04:09 +03:00
lzk
4ff34458cf Lowercase some prototypes names (#29990)
* Lowercase some prototypes names

* huh

* return altar

* apply

* meta map
2024-07-23 11:16:11 +03:00
TheKittehJesus
1f29a5ad36 Fix: Syndie borg can now wield DEsword (#30229)
* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu
2024-07-23 01:13:18 -07:00
Errant
eb861d173f Wrong magazine popup (#29046)
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings
2024-07-22 23:36:05 -07:00
Cojoke
2d4aaa414f telescreen and television require vision + Move eye to shared (#30260)
* telescreen and television require vision

* Move Content.Server.Eye to Shared

* fix popups

* Filthy
2024-07-22 19:33:41 -07:00
Cojoke
88cc6753ea Adds the Volume of a Gas Tank to its Examine Text (#29771)
* Adds the Volume of a Gas Tank to its Examine Text

* Put Volume in description

* Put Volume in description

* work please?

* Hit space bar
2024-07-22 14:41:42 -07:00
3nderall
159a7413a7 Stops foam counting as a connection for walls (#30236)
Stops walls from connecting to foam

Co-authored-by: 3nderall <3nderall@gmail.com>
2024-07-22 12:55:44 +03:00
LankLTE
395b296d68 Darts can now pop balloons. (#30088)
Basic implementation.
2024-07-21 22:38:56 -07:00
justdie12
290542534a Update water.yml (#29596)
* Update water.yml

Water should put out the fire. That's why now the water tiles are extinguishing you.

* Update water.yml
2024-07-22 12:53:10 +10:00
slarticodefast
a0aafdfedd vital clown bugfix PR (#30243)
vital bugfix
2024-07-21 19:50:21 -07:00
Sphiral
1e89c07573 The Shelfs Update (#27858)
* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
2024-07-21 11:16:58 -06:00
Plykiya
aded74a88a Syndicate Reinforcement Specializations: Medic, Spy, Thief (#29853)
* Syndicate thief, spy, medic

* Fixes description for nukies

* update description for uplink

* Implement the radial menu

* forgot these were necessary to push lol

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-21 20:32:25 +10:00
IProduceWidgets
ac53e1d0a0 add an arabian lamp. (#27270)
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.
2024-07-21 01:24:28 -06:00
metalgearsloth
56de41e8a7 Hide escape pods on shuttle map (#29758) 2024-07-21 17:23:44 +10:00
Winkarst
ee2e94a204 Fix servers ambience sound (#30091)
* Fix servers ambience

* I'm silly

* Clean up
2024-07-21 17:22:02 +10:00
Alzore
c8725825be Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947)
* no more lasers for you, borg.

* downgrade

* echis

* echis

* itemtoggleupdate

* daggerparenting

* fixtypo

* more bullet per bullet
2024-07-21 17:04:33 +10:00
Crude Oil
6c6ae35cf8 Add ability to show stack visuals on closed containers (#29309)
* add ability to show stack visuals on closed containers

* remove container stack visuals logic from sharedstoragesystem

* improve comments a bit

* move logic for open/closed containers into itemcountersystem

* move behavior to storage component

* remove unused import

* remove old comment

* fix comments

* fix wrong property name

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

* Rename variable for clarity

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-07-20 22:49:48 -07:00
buntobaggins
6b57cf2020 Spationaut Hardsuit Light buff (#30049)
Buffed the light on the Spationaut Hardsuit

Co-authored-by: buntobaggins <email.com>
2024-07-20 20:29:21 -07:00
JIPDawg
1208928564 Added missing builld components to RCD [empty] (#30177)
* Added missing stuff to rcd[empty]

* do the smart thing

---------

Co-authored-by: JIP <jipdawg93@gmail.com>
2024-07-20 02:23:07 -04:00
SlamBamActionman
6972bc26a7 Directional Fans (#27772)
* Initial commit

* Description update

* Updated texture
2024-07-20 13:18:34 +10:00
Plykiya
7683acab5e Fix Chameleon Scarf menu being blank (#30156)
fixa the scarfa

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-19 23:00:28 -04:00
Ghagliiarghii
e6b171645c Give NukeOps Reinforcements an ID Card (in a PDA) (#28088)
* Give NukeOps Reinforcements an ID Card (in a PDA)

* add warning comment

* create syndicateoperativegeatreinforcementnukeops in traitor.yml

* revert fun/misc_startinggear.yml
2024-07-20 12:59:31 +10:00
slarticodefast
eaace152ae Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112)
* fix embeddable offset with throwing angle

* number
2024-07-19 19:42:58 +10:00
Alzore
93dc22b67d Add the Syndicate Raid Suit (#29845)
* Syndicate Raid Suit

* Raid suit speed and whitelist

* Fix copyright for the syndicate raid helmet
2024-07-19 12:38:26 +03:00
Ed
ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
2024-07-19 11:23:38 +03:00
Ed
d6e0114126 randomize iconSmoothing (#28158)
* randomize iconSmoothing

* Revert "randomize iconSmoothing"

This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e.

* try 2

* trying work with client-server communication

* still dont work

* Tayrtahn good suggestion

* remove outdated code

* Fix!

* move data to Appearance

* Update RandomIconSmoothComponent.cs
2024-07-19 18:13:35 +10:00