Commit Graph

3134 Commits

Author SHA1 Message Date
Tiniest Shark
a1cf490360 Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
Pieter-Jan Briers
bebc077fcc MapRenderer code fixes (#38357)
* Fix MapRenderer integration test usage to properly show output.

Added an ITestContextLike interface that can be used to properly run the integration test infrastructure OUTSIDE A TEST.

* Use System.Test.Json instead of Newtonsoft.Json for MapRenderer

* Fix map renderer JSON output being broken

I love not testing or even reading the surrounding code.

* Fix un-reusable integration instances getting leaked.

The pair state was always getting set to Ready even if the instance was killed, meaning it was getting put back into the pool even if killed.

* Mark map renderer integration instances as destructive to avoid memory leak.

* Fix file specification handling.

Map file specification is now backwards compatible again (loose filename match to search prototypes). It also supports proper direct OS filename arguments. The former is the fallback scenario is extremely important for the map server still.

Cleaned up the way that target map files are passed through the application, so mixed file/prototype specifications are now handled properly (which can be caused by the fallback behavior).

Fixes JSON data export to use the proper user-facing map name. This only works if a prototype ID is specified *or* the legacy file behavior is used.

Restructured MapPainter into an instance that has multiple functions called on it, so not all data has to be passed through a single Paint() call.

Clean up the godawful map/grid detection code. Now we just load both in a single call, because yes you can do that. This relies on LogOrphanedGrids = false in the map loader options, which I think is fine for our purposes.

Improved error handling in much of the program.

* Fix duplicate map names in map renderer output

I'm not sure *what* this output is used for, but I'm sure having it duplicated per grid isn't intentional.

* Make maprenderer command line parsing bail on unknown - options

* Fix incorrect docs for --viewer maprenderer argument

It doesn't change directory layout

* Fix parallax layer specification to not use imgur as a fucking CDN

Files are now copied to a separate folder _parallax, and these files are referenced by the parallax configuration.

Parallax data is only output when instructed to via --parallax.

This will break parallax on current map server builds, but it should be graceful. Also, that's fucking good considering we shouldn't be using imgur links. Purge it.

* Fix incorrect assert in test pair clean return

* Restore other map viewer parallax layers, fix attribution.

* This isn't a valid copyright statement but the validator forces me to enter something here.
2025-06-26 14:47:39 +02:00
ScarKy0
6b8842c44d Generic Numeric Alerts (#38370) 2025-06-21 20:59:37 +03:00
Prole
f1d60b44e1 Flask Visual Overhaul & YML Organizing (#38032)
* Adding Back Baseline V1 Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Readability Change

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* icon_open implementation, tidy up & attributions (fix lith/shiny flask ugly af open sprites)

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* good enough

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* No mo closed spills

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Inhands & Attributions Part 1

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Inhands & Attributions Part 2

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Flask Sounds & Attributions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Cap flask inhands change

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Lith flask Inhand Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Spacing

* Fix?

* Man...

* Attributions Back in...

* Im loosing it..

* REAL!

* :/

* Again...

* again :/

* Plz???

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-06-21 10:52:36 -04:00
Hannah Giovanna Dawson
48d897d31e Scurrets (#38218)
* Scurrets.

* Add missing equipment YAML

* Fix count of NamesFirstScurret

* Resolve PR comments, wa.

Also add like a bunch more wa replacements

* ed

* Update Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json

* :rivflabbergasted:

* Fixed spacings in scurret_last.ftl

* Fix mangled endings of some last names

* wawa

* the scug has a spear for self defence
2025-06-20 16:39:08 -07:00
Sparlight
af23939dbe Adds dog-shaped sprite variants for the most common hardsuits (#36875)
Co-authored-by: dandy <203235481+casiliuscestus@users.noreply.github.com>
Co-authored-by: Raccoononi <70777222+raccoononi@users.noreply.github.com>
Co-authored-by: Scrubdelub <196583332+scrubdelub@users.noreply.github.com>
Co-authored-by: Tiniest Shark <176858593+TiniestShark@users.noreply.github.com>
2025-06-19 12:49:09 -07:00
Perry Fraser
9a605c8642 fix: deglitchify drowsiness effect on macOS (#37817) 2025-06-17 23:05:12 +02:00
SlamBamActionman
22e6aef2c5 Scale down 4k parallax textures (#38390)
* Scale down 4k textures, add false preload to new parallaxes

* Add filter effect, also make sure the preload yml actually has the correct name...
2025-06-17 18:53:58 +02:00
Red
52cc834a0e Spider web visuals update (#38175)
* web update

* Update Resources/Prototypes/Entities/Structures/spider_web.yml

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

* Update Resources/Prototypes/Entities/Structures/spider_web.yml

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

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-16 17:30:43 -07:00
August Sun
bdcdb6e338 Adds the Estoc DMR to the syndicate uplink (#38122)
* Initial commit, adds the prototype, sprites and attributions, entries into syndicate uplink for weapon bundle and magazines

* Reduced weapon spread when wielded

* minor visual updates to sprites

* slightly adjusted burst rate down

* Update duffelbag.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-06-16 17:20:08 -07:00
ArtisticRoomba
3eba895fc7 Thieves can innately pickpocket - thieving gloves rework (#38123)
* Thieves can innately pickpocket (#107)

Pickpocketing a skyrim guard's armor off

(cherry picked from commit 21b9f1ddb251ea3c7c6803e78871abefcaecbfb4)

* this isnt moff

* Make predicted, cleanup

* !skating-basketball

* orks are NOT the best trollface

* Implement much more sensible component replication prevention

---------

Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com>
2025-06-16 15:47:31 -07:00
Seam_Less
861d0fac71 Gun Inhand Sprite Fixes (#38294)
* cobra, viper, pulse pistol

* c20 and wt550

* l6 + attributions
2025-06-16 18:03:14 -04:00
Hitlinemoss
0202166406 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Merged master into branch
2025-06-16 06:01:18 -04:00
SlamBamActionman
9af0b354e3 Exo Station - Upstream Playtest Version (#33144)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-15 12:10:22 -07:00
ScarKy0
208b245dcb Retractable items system + Arm Blade action (#38150) 2025-06-14 21:29:06 +03:00
Sparlight
937326460f Add pet bag - wearable backpack for pets (#37440)
* Add pet bag

* Trailing whitespace moment

* make the linter happy

* Fix trailing whitespace concern.

* Fix Construction component oopsy-daisy

* yml guideline moment

* remove weird extra whitespace

* make the maintainer happy

* Adjusted bag visuals based on feedback

* Allow the fox aghost admin to use pet bags
2025-06-14 09:09:05 -07:00
Kittygyat
98031d13a1 Added monkey/kobold emergency EVA sprites & the ability for them to wear them. (#37660)
* Added monkey/kobold emergency eva suit sprites, and the ability for them to wear it

* Added tag, fixed indentation

* Ok actually fixed the indentation this time
2025-06-13 20:54:21 +02:00
Nikovnik
685e7028d2 Transparent tear gas (#36440)
* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-06-13 09:53:44 -04:00
Perry Fraser
82f598a087 Use correct on-head rainbow lizard plushie sprite (#38286) 2025-06-12 14:24:19 -07:00
SlamBamActionman
9a5bd9de6a Add propeller hat & swirl lollipop (#38260) 2025-06-11 18:22:51 -07:00
RedBookcase
a8801e4abf Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189)
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-11 16:29:27 -07:00
Boaz1111
55540c374a scar availability for more species (#35645)
* :D

* updated for new scars

* small eye scar
2025-06-11 23:56:57 +02:00
Seam_Less
f046d8a1f6 Magazine rsi Cleanup + Magazine Type Recolor (#37709) 2025-06-11 13:03:14 -07:00
Prole
1c99b8405b Guitar Sprite Fix (#38207)
* Modified Guitar Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Attributions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-06-11 02:51:19 +02:00
Southbridge
cbf8fa2349 Remade the AI Camera Static Shader (#38093)
Redid the camera static shader
2025-06-09 21:47:35 -07:00
Disp-Dev
c3956eff6d New Recipes: Breakfasts (#37279)
* Adds full english and american breakfasts and respective recipes

* sprite tweak and added random spawner

* reagent rebalance

* reagent re-rebalance

* spawner ID fix

* ACTUALLY actually fixed the spawner, also description changes

* reagent re-re-rebalance

* spawner fix so the linter stops screaming at me

* different check failed kekw

* trailing whitespace fix attempt #1

* identation fix? i think?

* indetation fix part 2, also vox cant eat this anymore

* more yaml fixes

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
2025-06-10 00:33:02 +02:00
Tiniest Shark
2d08f79229 Assorted device and core inhands (#38162)
* Assorted device and core inhands

* whoops forgot the thief objective

* i missed literally on pixel on the fulton argh

* inhand pinpointer update
2025-06-09 00:40:14 -07:00
K-Dynamic
eb208a2ae8 Genpop wall lockers (#38102)
* sprites

* genpop wall lockers

* number 5 alive

* slight boilerplate code, thank you slarti
2025-06-07 17:51:38 +02:00
Spanky
668a0f0863 Light Up Landmines (#38092)
* Adjust landmines to have unshaded lights.

* Someday I will give myself credit for the work I do.

* Adjust animation speed.
2025-06-06 19:01:14 -04:00
RedBookcase
219015dcd8 Added Scrap Armor [Reupload]. (#37601)
* Added Scrap Armor v2.

* Added a note to scrap helmet about vision reduction.

* Removed protection from step triggers.

* The patient needs broken kneecaps to live.

* Add in missing tag

* Missing tags pt 2

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-06-05 20:13:36 -04:00
Xeri Marai
18fa45addd Improve Potted Plant Movability and Availability (#37591)
* Added Purchasable Potted Plant Crate

* Removing some whitespace that made it in elsewhere

* Making Potted Plants Items and pickupable

* Revert Making potted plants not fade

This reverts part of commit a50a7def80c06e5be68a37263306007739952a28.

* Adding self to credits

* Fixing sus spacing
2025-06-05 19:36:31 -04:00
Hitlinemoss
3d942e1cad Added security mime mask (#37890)
* Added security mime mask

* Improved security mime mask equipped sprites

* Improved security mime mask icon sprite

* meta.json spacing fix
2025-06-05 19:23:13 -04:00
Orsoniks
e21fb8ff39 In-hand sprites for some food items (#38024)
* so meow changes

* qwawa

* fixed sprites

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json

* more inhand variations using coloring

not perfect but better than nothing

* more meats

* pizza inhands, ported from starlight and edited

* add link

* snack inhands

* worldpeas

* chips

* packets

* all snacks and trashes finished

* correction
2025-06-05 17:06:38 -04:00
slarticodefast
7d2d05b99c Fix noir shader in compability mode (#38080)
fix noir shader in compability mode
2025-06-05 14:52:39 +02:00
Spanky
9bb3140550 Evac Repair Lockers (#38075)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-06-04 23:08:38 -07:00
SlamBamActionman
d81e82cef7 Add Diona rooting (#32782)
* Initial commit

* Add sound

* Review commets

* addressing review

* I think this is what Slart meant?

* Review fixes

* More fixes

* tiny formatting

* Review fixes

* Review fixes

* Fix small timing error

* Follow new action system

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-06-04 12:52:59 +02:00
Moomoobeef
2184d38460 Stylized the nanotask printouts to be *pretty* (#37805) 2025-06-04 01:16:14 -07:00
slarticodefast
1441effed2 improve noir glasses shader (#37996)
* improve noir glasses shader

* tweak values
2025-06-02 09:16:10 -07:00
chromiumboy
45012cbe1d Layering for atmospheric pipes (#36124)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2025-06-01 22:01:43 -07:00
K-Dynamic
7b9d5b400f Mirror resprite (#37899)
* mirror resprite, add snapgridcenter

* antique mirror

* swap default mirror; antique-mirror renamed back to mirror, new mirror renamed rectangle-mirror, changed RSI underscore to regular dash for consistency
2025-05-31 21:36:10 -04:00
GnarpGnarp
f21b6d139a Rename paper_background_black files (#37976)
Renamed "paper_background_black" to "paper_background_blood_red" as the colour of the file is not black.
2025-05-31 13:09:10 -07:00
K-Dynamic
e1b85cc9d1 Resprites black, brown, fancy, white cowboy boots (#37901)
* black and brown cowboy boots

* fancy cowboy boots

* west virginiaaaaaaa mountain mamaaaaaa take me hooooome country roooadddds

* inhands for every boot

* forgor about white boots
2025-05-30 19:59:57 -04:00
Kyle Tyo
85636335ec Decouple the lamp from the base air alarm sprite. (#37950)
a touch of verin here and a sprinkle of verin there
2025-05-30 19:37:51 -04:00
Spanky
3c53b2835a Fix Secret Door Sprites (#37914)
* Make secret doors have unique directional sprites, and new animations.

* Update attributions.
2025-05-30 20:11:48 +02:00
Alpaccalypse
0df4a2e243 Absinthe makes you mildly hallucinate (#34371)
* Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick.

* Reordered glass fill sprites to look more equal
2025-05-30 18:03:49 +02:00
beck-thompson
05fac53de6 Chameleon controller implant (Clothing fast switch) (#33887)
* Add the chameleon controller implant

* address the issues (Git please dont kill me)

* Address the review and fix some merge conflicts!

* Cleanup

* Add use delay

* Silly mistakes

* Making a PR at 2 am: Gone wrong

* Predict use delay and disable the buttons until you can choose another

* First phase custom clothing

* Better system, now relays to agent id and mindshield. Chameleon loadouts are a lot better to work with as well

* Address the review! No more evil goto

* Slams way is better I should have read more closely xD

* Some of the jobs

* Add to Cargo, CentComm, Service, Passenger, Ninja, Cluwne, Wizard + Minor changes to existing; Add chameleon to bandanas, medals, jugsuits and HUDs

* Add everything else

* Fix test

* Job name

* This looks better

* Add department organization

* Minor cleanup

* Added some mindshields

* Remove redudent comment and change funcion name to be clearer

* Fix cluwne outfit

* fix merge conflicts

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-05-30 12:07:25 +02:00
brainfood1183
1118ea50e0 New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)
* new sprites for coal and gold ore crabs, new bananioum ore crab and rock anomaly.

* add whitespace to end of line in ore.yml

* fix white space end of file.

* fix for linter fail.
2025-05-29 18:16:20 -07:00
Tiniest Shark
40e410cc1f Large Tail Wag (#37806)
Got Ubaser's approval, merging.
2025-05-28 00:55:31 -04:00
Tiniest Shark
b2469b67a7 art update on the spine 2025-05-28 00:44:05 -04:00
Southbridge
755ce6f59b Decal Spawners (#37066)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-27 16:55:48 -07:00