Commit Graph

7818 Commits

Author SHA1 Message Date
Hi-Im-Shot
d95b5da7d2 Added Cutting Slicing and Executing options to the cane blade (#40311)
* Added Cutting Slicing and Executing options to the cane blade

* swaped from BaseItem to BaseSword for cleaner code

* fixed a double gap in code
2025-09-18 21:37:04 +02:00
Hitlinemoss
5cb0917d5f Ninja items are now highly illegal (#39855)
* Added tactical katana + tactical katana shipment (placeholder descriptions)

* Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)"

This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11.

Whoops, committed to master by mistake

* Made ninja items highly illegal

* Rerun checks
2025-09-18 19:49:01 +02:00
āda
128d06518e Silence mime bags (#40317)
silence!!!

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-18 10:47:55 -07:00
Mora
0e0f015422 Rename medifab implanter to implant extractor and made it's description clearer (#40375)
* Renamed regular implanter (the extractor from the medifab) to implant extractor

* wrong way
2025-09-18 19:47:38 +02:00
Kittygyat
d9d968a479 Crashed the snakeskin boots stock-market by removing their hidden no-slip properties (#40201)
Crashed the snakeskin boots stockmarket by removing their non-slip properties
2025-09-18 19:39:35 +02:00
pathetic meowmeow
940eaa4674 Bring vulpkanin in-line with other species on hugging (#40183) 2025-09-18 19:17:37 +02:00
Minerva
4a815c006f Renames the "Integrated GPS" to "integrated GPS" (#40431)
Renames the Integrated GPS to not use title case
2025-09-17 18:42:35 -07:00
PicklOH
1a92ada5bd Adds Nukie IDs and PDAs, makes Nukie IDs able to copy accesses. (#37304)
* Adds Nukie IDs and PDAs, makes IDs able to copy access.

* Fixed PDA and ID parenting

* Meta.json spacing

* PDA parenting

* retest

* Forgot a comma OOPS

* Spacing

* Minor meff fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 17:15:18 -07:00
Errant
b692b6e33e Antag Rolebans (#35966)
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
2025-09-17 23:59:07 +02:00
IProduceWidgets
933da32da5 Remove Misgendering (#40425)
fix misgendering
2025-09-17 23:49:50 +02:00
Princess Cheeseballs
fc89f231a5 Mothership Core Prototype Cleanup (#40410)
* I cannot escape bodysystem no matter how hard I try

* Move 2 things

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 00:25:53 +02:00
chromiumboy
bc0691822a Bug fix for Station AI damaged accent (#40399)
Initial commit
2025-09-16 16:09:38 +02:00
SlamBamActionman
09a197eb91 Detunes Ninja Stun To Actually Have Some Counterplay (#39707) 2025-09-16 01:31:50 +02:00
chromiumboy
7444c8ea4a The station AI can be destroyed (#39588)
* Initial commit

* Fixing merge conflict

* Merge conflict fixed

* Anchorable entities can now be marked as 'unanchorable'

* Revert "Anchorable entities can now be marked as 'unanchorable'"

This reverts commit 6a502e62a703cf06bd36ed3bdefe655fc074cfc5

This functionality will be made into a separate PR

* Error sprite

* Update AI core appearance with sustained damage, spawn scrap on destroyed

* Added intellicard sprite

* AI damage overlays

* Added fixtures

* AI core accent changes when damaged or low on power

* Bug fix and pop up messages for inserting AIs into inoperable cores

* Updated 'dead' sprite

* Destroying the AI core reduces the number of AI job slots available

* AI battery duration set to 10 minutes

* Initial commit

* Allow MMIs used in the construction of AI cores to take them over

* Initial resources commit

* Initial code commit

* Sprite update

* Bug fixes and updates

* Basic console UI

* Code refactor

* Added lock screen

* Added all outstanding UI features

* Added purge sprites

* Better appearance handling

* Fixed issue with purge sprite

* Finalized UI design

* Major components finalized

* Bit of clean up

* Removed some code that was used for testing

* Tweaked some text

* Removed extra space

* Added the circuitboard to the RD's locker

* Addressed reviewer comments plus tweaks

* Addressed reviewer comments plus tweaks

* Removed instances of granular damage

* Various improvements

* Removed testing code

* Fixed issue with disabled buttons

* Finalized code

* Addressed review comments

* Added a spare Station AI core electronics to the research director's locker

* Fixing build failure

* Addressed review comments

* Addressed review comments

* Added reverse path for construction graph

* Removed unneeded reference

* Parts can be purchased through cargo

* Fixing merge conflict

* Merge conflict resolved

* Fixing merge conflict

* Code update

* Code updates

* Increased AI core health and gave it a sell price to fix test fail

* Added screen static sprite

* Added better support for ghosted AI players plus code tweaks

* Various improvements and clean up

* Increased purge duration to 60 seconds

* Fixed needless complication

* Addressed reviewer comments part 1

* Addressed reviewer comments part 2

* Further fixes

* Trying lower battery values to see if it fixes the test fail

* Adjusted power values again

* Addressed review comments

* Addressed review comments

* Fixed test fail

* Fixed bug with endless rebooting. Using rejuvenation on an AI core revives the AI inside.

* Added pop up text

* Bug fix

* Tweaks and fixes

* Fixed restoration console not updating when the AI finishes rebooting

* Update SharedStationAiSystem.Held.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-15 16:18:32 +02:00
chromiumboy
02061592dd Devices with access restrictions list those restrictions in their examination description (#37712) 2025-09-15 10:19:25 +03:00
SharkSnake98
fd20cc2a00 Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-09-14 18:30:12 -07:00
Princess Cheeseballs
11d434818e Merge staging into master (#40356) 2025-09-14 13:57:50 -07:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
2025-09-14 20:42:51 +02:00
Huaqas
7616b9aa1c Fix Heterochromia for Vulpkanin (#40320)
* Add More Holy Books

* Revert "Add More Holy Books"

This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995.

* Fix eyes

* Add the undergarments and ftl designations.

* Missed something.

* second edited line didnt save for some reason

* Im tired dont judge me

* Fix eyes

* Reverting stuff

* fix markings

* Its joever

* Update meta.json

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-14 11:18:48 -04:00
ScarKy0
fdd4789d32 Give vulps correct undergarments (#40341)
init
2025-09-14 00:39:38 -07:00
Huaqas
f1ae8ecdfe Add Undergarments to Vulpkanin (#40321)
Putting underwear on dogs.
2025-09-13 13:36:28 -04:00
IProduceWidgets
a4b7cd73c5 +1 Spam mail (#40310)
* 2nd edition

* remove OOC

* oop

* double oops
2025-09-13 09:15:10 +02:00
FungiFellow
bcc30813e9 Cockroach Gib when Stepped on (#40103)
* Cockroach Gib

* Prevent Cockroaches From Gibbing Eachother

* Added - type: RandomChanceTriggerCondition

* Update animals.yml

* Named SuccessChance Datafield

* successChance

* Revert Change

* Uncapitalize C

* RECAPITALIZE THE C
2025-09-13 00:01:13 -07:00
SurrealShibe
71bcda1fec Toilet fixes: Exception when constructing, proper seat layering (#40313)
they call me a plumber the
the way i fix da toiler
2025-09-12 15:47:21 -07:00
slarticodefast
82e7cb020c Delete DrinkComponent, migrate prototypes to EdibleComponent (#40308) 2025-09-12 15:26:56 -07:00
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294)
make the frag work
2025-09-11 18:36:10 -07:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285)
init
2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283)
Fix yoml
2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143)
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-11 12:57:30 +02:00
ToastEnjoyer
46f59300ac Laser rifle is contraband again (#40253)
* Fixed contraband tag

* practice isnt contraband

* Added base

* Removal
2025-09-10 19:37:10 -07:00
Princess Cheeseballs
2601853791 Cardboard Box Weightless Fix (#40260)
Box is no longer space faring

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-11 00:13:58 +02:00
imatsoup
35bb5c633c Make Butterflies zombie immune (#40265)
butterfly zombie no longer
2025-09-10 23:48:53 +02:00
Deerstop
a05d466a5e Decal spawners spawn on a higher layer (#39956)
changed decal spawn layer
2025-09-10 11:58:06 +03:00
Kittygyat
cb4bbf3d38 Reworded the Galoshes description to be more clear about what they actually do. (#40200)
Reworded the Galoshes description to be more clear about what they do
2025-09-08 19:47:45 -07:00
Centronias
82b94ec6de Derelict Mediborgs can Scan Solutions and see Mob Health (#40206)
Add mediborg unique components to derelict mediborg
2025-09-08 19:44:31 -07:00
Crude Oil
fb454351d2 Restore transfer amounts on regular syringes to 5, 10, 15 (#40197)
add transferamounts to regular syringes
2025-09-07 16:01:26 +02:00
ArtisticRoomba
ae9f56b234 fix: Atmos dP Window Inheritance (#40192) 2025-09-07 02:13:29 -07:00
ArtisticRoomba
8f8db391d8 Atmospherics Delta-Pressure YAML refactor (#40174) 2025-09-07 00:56:37 -07:00
Mr. 27
4eab05b55e Add some alternate jumpsuit designs which can be toggled (#31213)
* inital

* testfa

* New Sec sprite

* Update atmos

* Update meta.json

* Update meta.json

* 0

* Update meta.json
2025-09-06 13:55:02 -04:00
ScarKy0
2201d29048 Revert antique laser and appraisal tool sizes (#40158)
* init

* appraisal antique pistol sounds kinda cool tho ngl

* actually fuck items
2025-09-06 17:13:42 +02:00
Princess Cheeseballs
ca32d83417 Stable Into Master (#40155) 2025-09-06 02:32:00 -07:00
Princess Cheeseballs
8a1a1b98c4 [HOTFIX] Fix Burgers (#39773)
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-06 02:19:19 -07:00
ArtisticRoomba
3aff3dff93 Fix resin windows inheriting wrong dP values (#40151)
Fix resin windows inheriting from regular windows
2025-09-06 01:02:47 -07:00
iaada
3a7f8fc1a7 update for glue/lube tube inhand 2025-09-05 17:24:50 -05:00
iaada
29dda7949f Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
2025-09-05 17:07:09 -05:00
IProduceWidgets
dcd0f10070 Drink outta da toiler (#40133)
* totally unrelated to any other recent additions

* dispare

* enum
2025-09-05 22:03:10 +02:00