Commit Graph

8658 Commits

Author SHA1 Message Date
keronshb
fa3a04a527 Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201)
* Act

* Adds Jaunt ECS and related prototypes

* Adds jaunt sounds

* Adds enter and exit sound support to polymorphs

* Updates jaunt description

* Adds jaunt action sprite and changes jaunt polymorph to use it

* Adds Jaunt and upgrade to the wizard grimoire

* Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt

* Update Resources/Locale/en-US/store/spellbook-catalog.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* removes meta changes

* removes other meta changes

* adds context menu and a description to basemobjaunt

* comments for jaunt component and adds on component shutdown method

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Resources/Prototypes/Catalog/spellbook_catalog.yml

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-11-14 00:36:37 +01:00
August Sun
bd2d0ee5e5 Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass (#33223)
* First round of anomaly core functionalities added

* Added sliceTime to anom meat mass and cooked version

* Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core

* Added more functions

* Final touches to branch

* Cleaning up some of the metadata for sprites and component definitions

* PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml

* Lol jk these goddamn tests why me

* Quick updates based on feedback

* more changes to improve

* additional fixes and edits

* Changed tech core functionality

* added magboot functionality to grav core

* fixed issue with bluespace core sizing

* Reverting changes per request

* extra file to be deleted

* File cleanup

* Update chemicals.ftl

* Update cores.yml

* Update cores.yml

* Update meta.json

* Update chemicals.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update meal_recipes.yml

* Update cores.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-11-12 20:59:47 -06:00
SpaceRox1244
af3593a3b7 Adds new sprites for shotgun shell boxes (#33176)
* Adds new sprites for shotgun shell boxes

* Adds second set of mag visuals for slug and uranium casings

* Fixes yaml that I messed up

* Changes credit to new username before merging happens
2024-11-12 17:45:59 -06:00
Preston Smith
70e3650246 Make Droppers Respect Closed/Sealed Containers (#33011)
* Make droppers respect closed/sealed

* Combine nested

* Optimize conditions a bit
2024-11-12 19:06:43 +07:00
BramvanZijp
991bbc2d4f Merge branch 'stable' of https://github.com/space-wizards/space-station-14 into HotFixtoMaster 2024-11-11 18:52:49 +01:00
BramvanZijp
a138fede2b Make the Flare Gun & Security Shell Gun be unbolted by default. (#33248) 2024-11-11 17:12:36 +01:00
BramvanZijp
197d9e68dc HOTFIX: Fix Security Shell Gun being uncraftable. (#33247)
* Sec Shell Gun Craftability Hotfix

* Capital Fix
2024-11-10 21:22:03 -06:00
Shaddap1
1c8992ffbe Goliath rebalance (#31492)
Update asteroid.yml
2024-11-10 04:28:55 -07:00
Armok
d939e991bb Removed bola stam damage (#32989) 2024-11-09 22:32:54 -05:00
ScarKy0
287a9a07de Intellicards now have a doAfter. (#33198)
* init

* cleanup

* Oops! Forgot something

* addressing changes

* guh

* guh 2.0

* some cleanup

* all bless the intellicard

* Yippee

* small locale thing

* changes + small bugfix

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-11-09 13:29:29 -06:00
SlamBamActionman
1e368ae300 Add a Walking alert (#32954)
* Initial commit

* Review feedback changes

* ProtoId

* TempCommit

* First attempt to have client alerts

* Review changes
2024-11-08 18:28:24 -06:00
Boaz1111
fea5769cc5 dark green jumpsuit recolor, casual green jumpsuits added (#31710)
* green

* fix material arbitrage

* lighter
2024-11-08 15:50:14 +01:00
Jezithyr
84338686a3 Stable Merge (#33218) 2024-11-08 03:46:22 -08:00
deltanedas
80e148c265 cham projector fixes/rewrite (#27111)
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-08 12:15:41 +01:00
ScarKy0
379fb4cb6a AI can now speak once more. (#33196)
Yippee
2024-11-07 11:25:16 +01:00
SlamBamActionman
b15d5a7f27 Changes to "Burst" firemode; Drozd, WT550 and C20-r (#31292)
* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
2024-11-06 15:39:16 +01:00
BramvanZijp
d588409909 Rework the Flare Gun & add a Security Shell Gun. (#32829)
* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-11-06 15:27:10 +01:00
Plykiya
ed865ae973 make admeme mouse eternally hungry and thirsty by increasing decay rate (#33153)
* make admeme mouse eternally hungry and thirsty by increasing decay rate

* no starving slowdown, fix unnecessary declarations

* REVERTUS DELETUS
2024-11-06 15:19:02 +01:00
slarticodefast
8ddc5435a6 remove wanted list cartridge from captain PDA (#33084)
remove wanted list from captain PDA
2024-11-06 14:20:05 +01:00
slarticodefast
1ded8e7f03 fix artifact debug assert (#33171)
* fix artifact debug assert

* do the same for EffectBigIron

* 1 tab less
2024-11-05 23:12:35 +01:00
Preston Smith
5b4f4237a3 Fix: Web Clothing Butcher Issues (#33121)
* Make boot web cost equal to one cloth

* Make boots and coat butcher into web

* Remove unneeded default
2024-11-03 21:33:51 -06:00
Boolean-Buckeye
ad78b30ca3 make emergency lights (de)constructable (#32945)
* add an emergency light node to the LightFixture construction graph
* add a recipe entry to the construction menu for emergency light
* make emergency light entity at the emergency light node on the graph
* Make emergency light destroy to 1 steel and 1 glass shard to match
  the construction recipe

Co-authored-by: BooleanBuckeye <booleanbuckeye@gmail.com>
2024-11-03 21:24:22 -06:00
Tr1bute
f5fac7c5f2 Made the SpeciesChange mutation no longer transfer with Sterile Swabs. (#33126)
Made the SpeciesChange mutation no longer persist.

There was an issue where swabbing a mutated plant species: I.e Blood Tomato to a regular Tomato sapling would transfer the species mutation. It would not actually get the effect, which is probably why it went under the radar. This change makes it so that the SpeciesChange mutation cannot be transferred via swabbing.
2024-11-03 21:09:07 -06:00
Michael Krebs
5d9acb7643 fix: Remove duplicate light blue towel from misc loadout (#33145)
remove duplicate towel from misc loadout
2024-11-03 21:06:52 -06:00
RiceMar1244
0ba3350c7e Combat and survival knife storage/inhand sprites (#33111)
* Adds storage sprites for combat knife and survival knife. Replaces inhand sprites.

* Fixes meta.json copyright
2024-11-02 14:55:15 -05:00
Milon
6f1eeba191 change ShowHealthBars and ShowHealthIcons to use protoId (#32355)
use protoId
2024-11-02 17:59:38 +01:00
Scribbles0
65462d8ca5 Cardboard Box Capacity 4 -> 5 (#32743)
* capacity upgrade

* comment update
2024-11-02 17:21:35 +01:00
joshepvodka
8c1281adf7 Adds headphones to loadouts (#33067)
added headphones to trinkets
2024-11-02 16:12:25 +01:00
deltanedas
11f0dc420f clean up tools lathe recipes (#31521)
* clean up tools lathe recipes

* add medical and cooking tools

* add result

* add result to others

* review

* engine

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-02 14:24:08 +01:00
Ubaser
1c2fd6a11b Service workers antagonist fix. (#31359)
* add

* Revert "add"

This reverts commit 25da34b0fead5812fe5800c9bf5dd7b10ef48d7d.

* antagonism allowed™️
2024-11-02 05:07:51 -05:00
K-Dynamic
b000a3e387 Hasten handcraft gauze recipe & decrease techfab gauze cost (#32744)
* med lathe gauze price reduction

* gauze craft doafter time

* 3 second doafter craft
2024-11-02 10:53:18 +01:00
K-Dynamic
05ae40400c Pills are explosion resistant (partially reverts #15851) (#32458)
* idk how to revert a pr so I just deleted some lines

* pill destructible with explosion resistance

* comment for explosion resist

* "and" to "but"

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2024-11-02 20:51:44 +11:00
Minemoder5000
b8a98de784 Remove CargoPallet component from the cargo pallet (#33022)
* Change cargo shuttle pallets to catwalks.

* Remove CargoPallet component from the cargo pallet.

* Undo cargo shuttle changes.
2024-11-01 09:22:38 +03:00
ScarKy0
e17d152838 Borgs can no longer see mindshield + AI can no longer toggle off seeing job icons (#33069)
* :(

* Removed the sprite + updated RSI
2024-10-31 21:32:28 -05:00
RumiTiger
6ce80d914d Muffins (#29318)
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-31 22:06:46 -04:00
SlamBamActionman
4626904fa8 [#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)
* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

Co-authored-by: Psychpsyo <psychpsyo@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-31 19:46:19 +01:00
SpaceLizard
1c2a96590b Fixed spelling mistake in water blaster description. (#33087)
Fixed minor spelling mistake
2024-10-31 19:07:29 +01:00
BramvanZijp
a08da9d31f More pda space (#32601)
* Rebalance the max programs that a PDA can hold

* Give Caps PDA more programs too.

* Make the max programs a static 8

* I forgor sec and med

* CaseCase

* Empty commit to re-run checks

* The final change, I hope.
2024-10-31 15:53:38 +01:00
Jarmer123
4261698371 Add a spare bible to PietyVend (#32363)
Update chapel.yml
2024-10-31 14:26:45 +01:00
Boaz1111
a3dc0eb75a Pill Bottles can only store pills now (#33074)
* no longer absurd

* Update Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-31 11:56:07 +01:00
Alzore
4b467685b2 Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720)
* a-few-injectors

* comment

* defib-ops-when
2024-10-30 10:15:30 +01:00
Alzore
6834bc1fbd Add 3 bottle boxes to nanomed plus (#33018)
three bottle boxes in nanomed plus
2024-10-30 01:41:51 -06:00
Alzore
010638d0e9 Make the security belt contain more useful items by default (#32291)
* replace tear gas and flashbang with holobarrier and sec radio

* holobarrier-belt-fix
2024-10-30 01:40:33 -06:00
Alzore
0aa46f6a2a Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212)
* inhands

* better inhands

* indent
2024-10-30 01:38:19 -06:00
Flareguy
3d70cdf23c Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786)
* various resprites (encryption keys + signal screens + station map)

* brig timer update

* fixes n shit
2024-10-30 14:12:49 +11:00
Milon
440da3c640 fix chameleon projector bot whitelist (#33055)
fix
2024-10-30 02:03:06 +01:00
Preston Smith
907a9cef10 Fix: Make Plushie Damage Unexaminable (#33061)
Set hidden to true
2024-10-30 01:52:43 +01:00
deltanedas
63f8aba359 fix lava expeds (#33042)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-10-29 00:00:28 -05:00
lzk
dc3a2f6d28 add StartDelay bool to actions (#33026)
* add StartDelay bool to actions

* forgot summary
2024-10-28 23:21:14 +01:00
joshepvodka
30017bc2d8 Adds beacon to cog station vox box (#33000)
* added vox beacon

* changed name to vox break room

* added vox box station beacon
2024-10-28 16:03:13 -06:00