Commit Graph

94 Commits

Author SHA1 Message Date
Hitlinemoss
e718f0252d Golden plunger + security star(s) moved to job trinkets loadout tab (#41094)
* Golden plunger + security star(s) moved to job trinkets loadout tam

* Fixed being unable to pick both job-plushie and the plunger/star at the same time

* Whoops, forgot to commit the bartender fix

* SecStar playtime baked into prototype itself

* Removed increased job-trinket limit (likely bad to hardcode these for very specific roles)
2025-11-07 07:32:26 +00:00
Hitlinemoss
4efb02609e Assorted tweaks to towel trinkets (#39831)
* 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

* Cleaned up trinket menu

* Fixed dark green towel clothingVisuals color values

* Sorted towels by color

* Undo move of candles

* Sorted towels by actual HSV Hue value

* Remove 10h playtime requirement from white towels

* Removed cheap lighter from PR
2025-11-01 15:49:53 +00:00
ArtisticRoomba
1bbf958171 New job lizard plushies + Job-specific trinkets loadout (#34127)
* add the job wehs, add job crate fill and add purchaseable crate

* add job wehs to new loadout type

* add the MULTIWEH

* fix that one bug in testing

* mime and clown plushies have custom sounds

* was looking at the wrong thing alright

* indecisive

* properly attribute multiweh

* my worst nemesis, yaml linter... how dare they point out my mistakes...

* Remove crate and cargo buy at maintainer request

* add multiweh to bulk lizard plushie crate at a 1% chance

* double whammy

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2025-10-19 22:17:26 +00:00
Hitlinemoss
f80f322357 Added folders and clipboards to trinkets tab (#39920)
* Added folders to trinkets tab

* Fixed loadout grouping

* Added plastic clipboards to trinkets

* Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype

* Added regular clipboards as trinkets (1 hour of command required)

* Reduced folder bloat
2025-10-08 15:37:34 +00:00
Hitlinemoss
63c17b151d Added the golden shaker (playtime reward for Bartenders) (#40762)
* Added a golden shaker (playtime reward for Bartenders)

* Removed redundant icon line
2025-10-07 23:26:56 +00:00
Huaqas
0bb1ede5ee Remove the Tanakh and Satanic Bible from the game. (#39698)
* Remove the Tanakh and Satanic Bible from the game.

* Update migration.yml

* Renamed to Space Bible

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-10-07 09:04:05 +00:00
Errant
b9f2fd4e67 Replace all time requirements with bats (#40751)
time requirement format update
2025-10-07 08:43:54 +00:00
Huaqas
ee2b38d299 Create more Holy Books based off Spacestation 14 Dieties (#39181)
* Add More Holy Books

* Remove reference of original fork in meta.json

* Removed "rich" reagent description for Blessed Bolognese, and replaced with "holy".

* Updated Holy Liquids to each have their own minor effects.

* Tuned down Nar'sie Blood

* Create playtime requirements, and relocate holy water to it's own category.

All holy waters created through a bible are now located under the "Sacred" section of the guidebook, as to help maintain clutter.

* Replace 'curse' mixing verb with 'bless'.

* Update and fix guidebook to have section for 'Sacred' liquids.

* Add back in Tanakh and Satanic Bibles so they can be removed in other PR.

* Forgot to re-add the prototypes.

* Add back the time requirements I mistakenly removed.

* Remove Italian Bible

* Fix errors.

* Remove Carps & Crypts

* Relocate .ftl designations to their own sacred.ftl

* Forgot to update single_reagent.yml. Updated it now.

* Ended the communist dream. (Removed Communist Manifesto option for Chaplain)

* Give lamp book a little more pizzazz.

* Single line indent applied

* test

* untest

* Update sacred.yml

* Remove Unused Bibles, rename druids, moth bibles.

* Remove custom reagents.

* Error fixes.

* Reorder Bibles to Save my OCD.

* Flip that pentagram.

Bro must of rolled a nat 20 in convincing people this should be flipped. I know its more "accurate", but the layman will probably look at this and say its wrong.
Just a personal thought that escaped my brain and will never be read.

* Rename Druid Tablet, Delete Lantern Path

* Delete icon.png

* Delete inhand-left.png

* Delete inhand-right.png

* Delete meta.json

* Update chaplain.yml

* Update loadout_groups.yml

* Reorder for OCD
2025-10-07 07:28:48 +00:00
Sender
b6bbb5d1b4 Stage Name For Musicians (#40640)
added stage name for musicians
2025-10-01 11:35:29 +00:00
ScarKy0
b2c9106839 Vulpkanin Species (#37539)
* [April Fools] Elf species  (#35353)

elf

* [April Fools] Juice that makes me go insane (#35370)

* kill me

* MAKE IT STOP

* is it finally over?

* web edit

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* webedit

* WEBEDIT PLEASE

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* vulpkanin species

the ultimate april fools joke

Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com>

* cant be bothered

* make build and test debug run on the april fools branch (#35396)

welp

* Revert "[April Fools] Juice that makes me go insane (#35370)"

This reverts commit fcbdcf8452.

* Revert "[April Fools] Elf species  (#35353)"

This reverts commit 704293a051.

* nuh uh

* localized names

* fix survival box

* abilities (Mostly don't work yet, pending PRs)

* wagging loc

* slight heat tweaks

* stuff

* Update Vulpkanin.xml

* vulp screams + quieter howl

* MessyDrinker by Orks

* MessyDrinker guidebook

* animal bones

* fix wagging

* missed

* no loc

* Lower damage, remove butchering

* Revert "animal bones"

This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.

* leap

* collision

* leap desc update

* leap guidebook

* fix leap

* microbalance

* comment

* microbalancing pt 2

* microbalancing pt 3

* test fail fix (i hope)

* fix organs

* no leaping on the ground

* remove SolutionScanner + ling work

* fix clone

* add stuff back

* microbalancing pt yes

* male vulp names

mainly slavic names with some similiar sounding ones mixed in

* Revert "male vulp names"

This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.

* male vulps names pr 2 (slavic, dog names, few puns)

Slavic names, with mixed in typical dog names and some puns

* female names (mainly slavic, other stuff mixed in)

* oops

* Update vulpkanin.yml

* Vulps WIP Work (#1)

* Modified aesprite tools

* WIP

* wipperoni

* We are done here, wawa

* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"

This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.

* Resolve merge issue

* Fix Urist McVulp forgetting his fursuit

---------

Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>

* re-add ears and husk overlay

* revert adding ears to vox

* Crest Markings

* Fade Markings

* Sharp Markings

* microbalance + comments

* censor character nudity option compliance

* Ear Markings

* 1984 wagging animations

* Tail Markings

* tail wag icon

* annoyance

* guidebook

* slight temperature tweak

* seperate out snouts, port over 2 markings for testing

* fix

* seperate snout file

* Snout/Head Markings

* cleanup + locale for ears

* Head and Snout loc

* gray eyes

* crest and husk cleanup

* Tail and Chest loc

* Legs and Arms loc

* most important commit

* mime vulps like rations too

* missing loc

* microbalance

* not needed

* goatee

* white eyes

* harmony feedback tail fixes

* personal changes and fixes after playing

* fix fluffy tail clipping

* Sprite fixes, displacement fixes (#2)

* Tune head displacement

* Vulps Sprite Tuning

* helmets

* detail

* Urist

* wag

* comban't

* fix attributions

* remove vulp biosuits

* fix vulp beards

* fixed up ears

* comment note

* further ear tweaks

* engi helmets

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
2025-09-05 12:43:17 +02:00
SlamBamActionman
1a452494e6 Add senior courier PDA for cargo techs (#37661) 2025-09-03 22:22:28 +02:00
Mora
32ef32d5a0 Add Offset Canes + Trinket Canes Group (#39272)
* Added offset cane

* Added offset cane colors

* Added canes to the trinkets menu

* added color to names instead of suffix

* removes some stripes from the mime cane icon

* update file organization

* standard -> standard.rsi, stop making commits at nearly 3 in the morning.

* updated comment to be more explicit in what doesnt work

* Cane refactor :godo:

* git makes me very upset sometimes (fixed cane yaml)

* wooden->wood

* apparently this didnt push

* Standardize comments

* Removed comment

* Removed comment

* Adds red accents to mime cane

* Indent fixes
2025-08-04 19:39:40 -04:00
Hannah Giovanna Dawson
1d4c945561 Remove the Qur'an (#39000) 2025-07-15 03:52:05 -07:00
Trosling
6053509ceb New holy books (#38986)
* Adds a few new holy books, implements one existing, and makes them pickable from loadout

* Almost forgot the yaml

* Forgot to change fork-specific paths

* Modified copyright to be less specific as requested by maintainer

* Newlines

* Replaced scroll torah with a book-bound tanakh, as recommended by dvir001

* Changed all mentions to use tanakh instead of torah
2025-07-14 17:49:08 -07:00
Hitlinemoss
83f15bfada Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo 2025-07-07 18:09:10 -04:00
Vasilis The Pikachu
b650d3298e Revert "HoP's beret (#38601)"
This reverts commit e9c90fe66d.

Please check the maintainer meeting for details
2025-07-07 00:01:55 +02:00
Hitlinemoss
917b001cb4 removed cargo beret entirely 2025-06-28 15:41:28 -04:00
Hitlinemoss
cb9e2d9323 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Merged master into branch
2025-06-28 15:25:23 -04:00
Boaz1111
0f74bac415 Various Headphones Fixes and Tweaks (#38479)
* sprites, wearables

* neck

* icon-on sprite
2025-06-28 16:01:28 +02:00
96flo
e9c90fe66d HoP's beret (#38601)
* added HoP beret

* added beret to loadout

* added craft to machine

* added beret to hop ddresser

* Updated the authorship

* Change on request

* added 4-spaced

* Hot fix of dresser
2025-06-27 18:28:38 -04:00
Hitlinemoss
83232cc0a6 Added senior cargo items to loadout menu 2025-06-16 07:58:32 -04:00
qrwas
f8cf4dc829 Add group for loadouts (#36951)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-16 02:36:06 -07: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
paige404
65250e6f39 Properly add rainbow skirt to passenger loadout this time (#37501) 2025-05-17 18:30:00 -04:00
kosticia
5e38a0cdca Cotton baguette for moths (#36953)
* SAVE MILLIONS MOTHS FOREVER🗣🗣🗣🗣🗣🗣🗣

* now i forgot about it???
2025-05-12 14:37:12 +02:00
paige404
9610b23d55 Rainbow Jumpskirt (#37291)
* Add a rainbow jumpskirt. <3

* minor spelling mistake dot gif

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-05-09 07:48:08 -04:00
T
cc80f8d782 Added a semi-functional genderfluid pin. (#35854)
* Added a semi-function GenderfluidPin

* Update pins.yml

fix bug

* Fix meta.json under the newly merged "fix as you go" policy

* Update pin description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-21 13:46:33 -04:00
Phooooooooooooooooooooooooooooooosphate
a83402f382 Add the medical HUDs to medical's loadouts (except chem) (#32847)
Added the medical HUD and eyepatch to the medical (CMO, doctor, paramed and intern) loadout to let them choose between. Also gives the option for the regular glasses.
2025-04-21 14:07:33 +02:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
lzk
8ff7767c85 Allow clown mime and borg customize names (#35170)
* Allow clown mime and borg customize name

* how

* uh

* 3

* good commit
2025-04-18 12:32:03 +10:00
KingFroozy
736a51962e Skirt of Life resprite + white shoes to paramedic loadout (#32227)
* skirt rises

* white shoes

* remove from loadout
2025-04-13 12:35:28 +02:00
slarticodefast
d8ed9fe152 Paradox clones get all storage items the original has. (#35838)
* recursive storage copying

* include slime storage

* future proofing

* remove survival box
2025-03-16 15:02:19 -07:00
Momo
2412b4f634 Aroace pride pin, scarf, and cloak (#35718)
cloak, pin, and scarf added yayyyy
2025-03-08 16:21:21 +01:00
Brassica Prime
9615bc64f8 Engineers can now choose to wear no head piece (#35508)
fixes engi loadout

Co-authored-by: Pumkin69 <judeb@DESKTOP-M4B8G5D>
2025-02-25 20:21:45 -05:00
metalgearsloth
15b28936df Add loadout names (#31303)
* Add loadout names

Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.

* the box

* Spawning cherry pick

* Fix nit

* revert

* Final cleanup

* Real

* Name UI fix

* Migrations

* a

* Review

* Re-run migrations

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2025-02-11 18:30:24 +01:00
lzk
50ba607bf5 add straight ally pin (#34977) 2025-02-08 18:02:00 -05:00
centcomofficer24
a0fe21ac2f Added Genderqueer pin! (Properly this time.) (#34561)
* Added Genderqueer pin! (Properly this time.)

* Update meta.json
2025-02-05 21:49:41 -08:00
Julian Giebel
a967fc7486 Adds omnisexual pin (#34439)
* Make important change (#7)

This is to help julian test his bot

* Omnibus

* Remove random test file from testing a gh bot

* Add pin to vendor, spawners and loadout

---------

Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
2025-01-14 23:41:04 +01:00
Ed
1c33073af4 Multiple items in loadouts (#33193)
* loadouts update

* Update loadout_groups.yml

* darts to candles

* Update Resources/Prototypes/Loadouts/dummy_entities.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-24 01:24:19 +01:00
ArtisticRoomba
34bfc59b18 Fix detective Vox spawning with their chosen outer clothing on the floor, force detective to have a selected outerclothing like all other sec roles (#33765)
fix detective vox spawning with their outer clothing on the floor
2024-12-08 23:50:14 +01:00
MilenVolf
b66fd98514 Localize ai dataset names (#33608)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-06 16:38:00 +01: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
joshepvodka
8c1281adf7 Adds headphones to loadouts (#33067)
added headphones to trinkets
2024-11-02 16:12:25 +01:00
IProduceWidgets
091e4c1cb0 Add Towels (#32235)
* Towels

* make smoler

* Huh, wonder why that didnt fail locally. The curse of CaPiTaLiZaTiOn

* Teal swapped for LightBlue for medical.

* Appease the linter?

* magic?

* mimery

* lefthandedness
2024-10-18 17:24:43 +02:00
Арт
867efe8b5b Add flowers to loadout (#32097)
* Add_Poppy&Lily

* Add_FlowerWreath

* Add_Headflowers

Sprites, meta, prototype

* Id_Changes

* Changes

* Update_Sprite

* Desc_Change

* Scale_Change

* Sprite_Scaling
2024-10-06 14:48:49 +02:00
TakoDragon
23f4bc1d7a Gay Boykissers (#32584) 2024-10-01 23:07:48 +02:00
LittleNorthStar
bbf84d0346 Feature/grey trenchcoat for detective loadout (#32380)
* Detective grey coat available in loadout

* Revert "Detective grey coat available in loadout"

This reverts commit 3697e15518b300cbc110872dc92d7905b7ef2605.

* Reapply "Detective grey coat available in loadout"

This reverts commit 8e5f43a035d70a7076ba26d43ed683b135af1d99.

* Hoping I got this right?

* Fixing a oversight

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-27 12:03:54 +02:00
Errant
7d4ae67628 Vox LoneOp loadout fix (#31641)
oh shit here we go again
2024-09-15 02:34:01 +10:00
IProduceWidgets
62f268cbb0 Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)
* Add Protagonists

* Give visitors the right PDA at least, we need that RP value.

* tidy up

* spell check my beloved

* Everything about jobs have the same id names ahhhh!

* s

* rarity scarity.

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* cargo event now no has cargo access doors.

* break everything.

* still WIP, please excuse.

* finish all role loadouts

* extra roles, fix up grids, special pdas.

* Ghost role descriptions and mime powers

* rest of the fucking owl

* I tripped.

* I also fell.

* Fix the broken entity storage?

* hide mess under rug

* Stuff the rest of the mess into a closet.

* I forgor a spinny majig.

* a small lighting tweak.

* 1984 shuttles to new pr.

* 1984 shuttles to new pr 2 electric boogaloo

* poke the tests

* Revert "1984 shuttles to new pr 2 electric boogaloo"

This reverts commit b2ea7053b73cb17b59f8a80b23978a04a6a45a56.

* cowboy boot cleanup

* tableify

* antagimmunities

* Should be functional.

* vox safing

* un1984 clowns I guess

* oops forgor one

* misplaced file

* misplaced file v2

* weird test fail but okay

* Shuttles rarer

* Shuttle testing, fans, and power sanity. Also return of the syndie evac.

* le balance

* no write over fancy paper

* rerun tests

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-09-10 00:40:00 -06:00
DieselMohawk
8e6da5999b Adds Trooper Uniform to Loadouts (#32019) 2024-09-09 17:59:31 -06:00