Commit Graph

23023 Commits

Author SHA1 Message Date
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
PJBot
31d30f24f9 Automatic changelog update 2025-09-15 01:14:21 +00:00
ToastEnjoyer
9313c07924 Replaced incendiary AK ammo with normal AK ammo, bagel. (#40359) 2025-09-14 18:13:12 -07:00
PJBot
e05d9e944b Automatic changelog update 2025-09-15 00:37:56 +00:00
Nox
f1d52e0c13 Plasma Armory Restock (#39763)
* made some tweaks and fixes to the equipment in armory, security, and genpop.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* implemented minor fixes

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added changes from #40012

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed warden gun, tweaked some things, fixed camera coverage and atmos devices etc

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Got comp to sign off on changes, finished everything up, good to merge!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Tested for issues and fixed

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-09-14 18:37:41 -06:00
SlamBamActionman
97d4153d84 Add jetpacks to the Nukie Infiltrator (#39887) 2025-09-14 18:36:47 -06:00
PJBot
b4f4d6e295 Automatic changelog update 2025-09-14 23:47:14 +00:00
ToastEnjoyer
2ffe0db61f Linked radiation shields on bagel (#40358) 2025-09-14 16:46:03 -07:00
Princess Cheeseballs
11d434818e Merge staging into master (#40356) 2025-09-14 13:57:50 -07:00
PJBot
cc6aa626da Automatic changelog update 2025-09-14 19:27:49 +00:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02: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
PJBot
3732885713 Automatic changelog update 2025-09-14 15:19:56 +00: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
PJBot
1908317e3c Automatic changelog update 2025-09-14 07:40:46 +00:00
ScarKy0
fdd4789d32 Give vulps correct undergarments (#40341)
init
2025-09-14 00:39:38 -07:00
PJBot
29da03b4e4 Automatic changelog update 2025-09-14 05:45:42 +00:00
MissKay1994
c317fa9840 Massively reduce how lethal Man-O-War shuttle is (#40339)
no longer nukies in disguise
2025-09-13 23:44:32 -06:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
github-actions[bot]
e7dc6ae990 Update Credits (#40342)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-09-14 03:18:18 +02:00
PJBot
52a4e95651 Automatic changelog update 2025-09-13 17:37:36 +00:00
Huaqas
f1ae8ecdfe Add Undergarments to Vulpkanin (#40321)
Putting underwear on dogs.
2025-09-13 13:36:28 -04:00
PJBot
6768ff1e91 Automatic changelog update 2025-09-13 15:54:55 +00:00
slarticodefast
d17182c162 Change listplayers command permissions to require the PII flag (#40324) 2025-09-13 17:53:48 +02:00
IProduceWidgets
a4b7cd73c5 +1 Spam mail (#40310)
* 2nd edition

* remove OOC

* oop

* double oops
2025-09-13 09:15:10 +02:00
PJBot
659648b03d Automatic changelog update 2025-09-13 07:02:21 +00: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
PJBot
0ba1a7c4dd Automatic changelog update 2025-09-12 23:25:05 +00:00
PJBot
79a34556e5 Automatic changelog update 2025-09-12 22:48:32 +00: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
PJBot
d8c55aef3c Automatic changelog update 2025-09-11 22:08:44 +00:00
UpAndLeaves
1245487c9a storage and inventory toolshed commands (#39046)
* First commit

* CommandImplementation on singletons is die, a la moony

* Fix duplicated thingy because yes

* Prototypes, bugfixes, refactoring oh my

* Remember to actually stage your ftl changes next time, leaf
2025-09-11 15:07:37 -07:00
PJBot
bb970970c9 Automatic changelog update 2025-09-11 20:00:29 +00:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
PJBot
77eca4a570 Automatic changelog update 2025-09-11 16:00:24 +00: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
PJBot
b9920cbdcb Automatic changelog update 2025-09-11 11:38:33 +00:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
PJBot
5acc1633cb Automatic changelog update 2025-09-11 10:58:38 +00: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
GeneralGaws
a7eb5dd22b Fix darts inhand sprites (#40207)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2025-09-10 23:50:57 -04:00
PJBot
f271790f75 Automatic changelog update 2025-09-11 02:38:17 +00: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
PJBot
6e88b66735 Automatic changelog update 2025-09-11 01:48:04 +00:00