27 Commits

Author SHA1 Message Date
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
Ubaser
b07e8abedb EMT Belt Part 2 (#24289)
* add

* fix

* aaaa
2024-02-10 00:42:55 -08:00
Velcroboy
dfa71af1f8 Add Chef's Belt (#22868)
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-23 00:11:30 -07:00
JoeHammad1844
b6f7a183ea Better tear gas grenade belt sprite (#22666) 2023-12-17 12:21:40 -05:00
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
deltanedas
687ceee4ed Rolling pin can be worn in belt slot (#21019)
* sprite swap

* rolling pin can be put in belt

* test pls

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-16 00:09:06 -04:00
Kara
f8d194b117 Bows & arrows (#19771) 2023-09-22 02:45:21 -07:00
Skarletto
12cb42349e cap drip refactor (#18276)
* swap out captain hardhat

* updated navy cap cloak

* change default cap suit/skirt along with monkey alts

* fixes capcap shading

* cap hardhat

* slight sheath edit

* capcap now able to be worn by hamlet

* capcap ACTUALLY able to be worn by hamlet now

* mantle edit

* winter coat

* formalcloak

* small json edit

* me when the when me the when me when the

* carapace

* gloves

* goof'd

* gloves are darkerrrrr
2023-07-28 18:09:19 -06:00
Jackal298
f8d404d783 Mercenary Items (#16665)
* Mercenary Items

Adding Mercenary Items

* Fix

* icon jumpsuit fix

* Bot

* bot fix
2023-05-22 15:57:15 -06:00
brainfood1183
4d2a558977 [entities] Kangaroos, boxer improvements, boxing bell and hamlet updates. (#15546)
* kangaroo

* fixes

* fuix

* fixes and rotational sprites for bell

* why wont u work, stupid rsi thingy

* attempt to fix

* now hsould work

* fix bell

* fix the bell

* bell make noise on hitting it

* add faction simple hostile to space kangaroo

* added boxing kangaroo spawner comes with gloves and agressive
2023-04-23 20:31:07 -06:00
Jackal298
484611d741 add salvage rig (#15656) 2023-04-23 17:36:00 +10:00
Flareguy
854f88d69c Waist bags (#14474)
* Everything (hopefully)

* makes them actually obtainable (oops)

* renames the fannypack to "waist bag"

* Removes and replaces remaining mentions of fannypacks

* oops
2023-03-19 17:45:38 -07:00
Pieter-Jan Briers
14f8b4e6d5 Use new validate-rsis for workflow (#12997)
* Use new validate-rsis for workflow

* A

* Add python deps

* --ignore-installed

* Make it only work on RSI changes again.

* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Kara
ad7889e8a9 Magic staves + wands (#9070) 2022-07-14 19:45:27 -07: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
Emisse
a1b2a9c142 Nuclear Operative Medic (#8274)
* Update belts.yml

* Add files via upload

* Update hypospray.yml

* Update hypospray.yml

* Update belt.yml

* Update belts.yml

* Add files via upload

* Update misc_startinggear.yml

* Update belts.yml

* Update misc_startinggear.yml

* Update misc_startinggear.yml

* Update belt.yml

* Update duffelbag.yml

* Update duffelbag.yml

* Update misc_startinggear.yml

* Update belts.yml

* Update chemistry-bottles.yml

* Update chemistry-bottles.yml

* Update belt.yml

* Update belt.yml
2022-05-22 21:32:08 +10:00
Lamrr
44d849d3f6 (Re)adds captain's sabre (#6101) 2022-01-11 17:50:10 +11:00
Swept
b16a044a2b Added restrictions for what can be inserted into most belts (#4367)
* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo
2021-08-10 13:36:00 -07:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342)
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01: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
Pieter-Jan Briers
825d5c0604 Fix broken ce.rsi 2020-12-23 23:51:45 +01:00
Swept
c3a6d0c597 Add belt slots for several items 2020-12-23 16:32:42 +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
Swept
4a6d0ae5a4 More belts and welders (#2453)
* Adds sprites

* Added prototypes

* Adds experimental and mini welder

* Adds welder to CE's belt

* Lazily filled out the belts

* Added to spawn jobs

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/2453

* Update Resources/Prototypes/Entities/Objects/Tools/welders.yml

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-11-08 02:40:49 +01:00
Swept
2e12d8b758 Adds the Mime (#1798)
* Adds mime job

* Adds mime spawn point

* Moves the ID prototypes/textures to Objects/Misc

* The things I do to avoid conflicts

* identification_cards.yml's final resting place

* Adds ID card and PDA

* Center mime id

* Puts pen and paper in the mimes pocket

* Adds mime spawnpoint to Saltern

* Revert "Adds mime spawnpoint to Saltern"

This reverts commit 56c6cf729baae0958b8b41dd83f71355e4e5f9aa.

* Add mime spawn point

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-01 21:42:31 +02:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00