65 Commits

Author SHA1 Message Date
Cheackraze
a512a77046 Zookeeper (#12020)
* jumpsuit sprite

* hat and meta to match

* pda

* id card

* update spawner jobs.yml

* update identification_cards.yml

* Update pda.yml

* update jumpsuits.yml

* zookeeper job yml

* zookeeper icon

* update hats.yml

* woops fixed hats.yml

* fix id cards yml

* job spawner icon and json

* update map yml

* update departments yml

* job icon meta.json

* comes with the hat

* real

* real

* localization

* fix spawner jobs yml

* playtime tracker

* kettle spawn

* Revert "kettle spawn"

This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a.

* kettle spawn

* service locked windoor

* updated sprites and updated meta.json thanks to EmoGarbage

* meta.json

* Update Resources/Textures/Objects/Devices/pda.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* credit to EmoGarbage404 and alphabetized

* license

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2022-10-23 14:42:25 -05:00
ChilbroBaggins
86f63a17d4 Rasta hat (#11269)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-09-16 07:40:49 -07:00
Ablankmann
5c8babb44e Better Outlaw's Hat (#10291) 2022-08-13 23:52:24 +10:00
Ablankmann
1af61c5041 Syndicate Shoulder Holster and the Outlaw's Hat (#9147)
* Syndie Holster sprite

* Outlaw Hat sprite

* Outlaw Hat entity

* Syndie Shoulder Holster entity

* Tweaked sussy toolbox

* Tweaked Syndie Holster

* Outlaw Hat and Syndie Holster to the Uplink

* it was a misinput, calm down

* Tweaked holster so it can only hold weapons

* and ammo too

* fixing conflicts... from my OWN PR....

* Fixed another conlfict

* fix
2022-06-27 16:25:22 -07:00
Kai Shiba
743b86bfe6 Nun Robes And Nurse Hat (#8681)
* Uploaded Nurse Hat

* Uploaded Nurse Outfit

* Uploaded Nun Robes

* Edited for Nun Robes

* Edited for Nurse Skirt

* Edited for Nurse Hat

* Edited Medidrobe for Nurse Attire

* Edited Chapeldrobe for Nun Robe

* Removed Nurse Outfit from Review

* Edited out Nurse changes

* Edited out Nurse Outfit
2022-06-18 15:23:49 +10:00
Emisse
f8f5a7fbf3 fix fish hat (#8123) 2022-05-12 16:01:20 -07:00
Emisse
40361ec0ad Fish Cap (#8046)
* Add files via upload

* Update hats.yml

* Update clothesmate.yml
2022-05-12 21:15:25 +10:00
Peptide90
a1aba4983a Adds cat ears as rare loot and traitor item (#6939)
* adds cat ears that give uwu accent

* error

* Updated to 20tc

Web edit yoink

* 21 TC now
2022-05-12 20:53:01 +10:00
Kai Shiba
90f73d3fcc Papersack hat (#7236) 2022-03-24 14:31:13 +11:00
Zymem
8b7c79203e Adds Syndie pyjamas (#6438) 2022-02-04 14:16:31 -07:00
Swept
9d22869e58 Adds a ton more inhands (#4488)
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-20 05:36:32 +00:00
Swept
532c9a6431 Adds an alternate jumpsuit for botany (#4419)
* Adds an alternate botanists jumpsuit

* Updated license information
2021-08-05 20:18:05 +10:00
SweptWasTaken
00b0760db3 Updates a lot of clothing inhands 2021-05-09 18:34:38 -07:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Swept
f46a6a8d81 Copyright Pass/Pruning | Part 1 - Clothing (#2539)
* Backpacks/Belts

* Cleans up Headsets

* Glasses and Gloves (Remind me to make an alpha for those stupid gloves)

* This commit has taken too many of my damn tears please appreciate it

* Holy SHIT that was an ordeal

* NECK and MASKS

* Jumpsuits/skirts

* Goodbye old color.rsi

* Outerclothing

* More Outerclothing

* It builds now

* More ID organization :)

* Gloves up to scratch

* My piss burns

* GLasses

* Added some more glasses

* Mission control we are ready for review

* Hotfix

* Cleanup

* Fix not commenting out whole line in contents

* duffelbag => duffel bag

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

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed Breath Mask

* Scrubs

* New line

* Fixed Build

* Ok

* Update engivend.yml

* Fix meson glasses prototype in boxes

* Fix prototype name for sec glasses in boxes

* Fix InventoryHelpersTest janitor jumpsuit prototype

* Fix outdated stationstation prototypes

* Fix vending machines having invalid starting inventories

* Fix chapel vending machine

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2020-11-22 15:17:14 +11:00