Commit Graph

34 Commits

Author SHA1 Message Date
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
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Swept
6376e60b78 Massive Food PR (#3436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
SweptWasTaken
0976755eb0 Minor RSI fixes and corgi hide name 2021-04-22 12:11:48 -07:00
ShadowCommander
a98c0dadd4 Implement inflatable wall (#3703)
* Implement inflatable wall

* Actually block atmos

* Fix naming and add description

* Add requested changes

* Change prototype to field

* Refactor checks to use existing methods

* Fix PrototypeIdSerializer imports

* Fix mass in yaml
2021-04-01 00:04:56 -07:00
Pieter-Jan Briers
dc11ebf760 Fix all broken RSI files. 2021-03-09 22:06:17 +01:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Swept
a9a96f2edc Crayon balance and reorganize (#3388)
* Organized and halved crayons write amount

* StackVisualizer for crayon box

* Mime's Crayon

* Gives crayons the write tag

* Applies reviews

* Fuck yo prefixes

* Update fun.yml
2021-02-27 16:59:20 -08:00
Swept
1056b9005f Fixes Torch (#3270)
* Updates RSI

* Done

* Finish

* SoulSloth you give me conniptions

* Nvm it was Nuke who made this, sorry soulsloth.

* E

* I am retar
2021-02-27 10:23:14 +01:00
Swept
4a67fc1d22 Fleshes out smoking content (#3295)
* RSIs sorted out

* Bookmark

* Updated packet RSIs for Stacks

* Cigs Packs done

* Cigarette Cartons

* fucking MANUALLY fixed the cigarette inhands, fuck you tgstation

* Pipes work

* Cigars/Cases

* Updates vending machine inventory

* tweaks count

* Adds a cigarette crate

* Fixes RSIs, working on rolling paper

* Adds Tobacco and Cannabis plants

* Cigarettes and Rollies are now craftable

* There

* Fixed crafting recipes

* Reset RobustToolbox

* Netsync'd

* Ready

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-02-22 15:08:17 +11: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
bfe575b7b6 Random bedsheet spawner. (#2940)
* Initial

* Optimized YAML

* Probbed

* Updates RSIs

* Maps them into dorms.

* A

* Adds descriptions from TG

* Addressed reviews
2021-01-11 18:02:36 +11:00
Swept
b44cb0095a Traitor Uplink Content (#2778)
* Adds syndicate toolbox

* Ancient jumpsuit

* Disk, Extra-bright lantern, syn med/ammo duffels etc.

* Disk sprite fixed

* Final

* Addressed reviews

* Update duffel.yml

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-12-20 00:16:50 +01:00
Swept
740fe65a39 Fixes ID card sprites (#2764) 2020-12-18 11:09:53 +01:00
20kdc
fd0df9a00a Traitor Deathmatch (#2719)
* Traitor Deathmatch: Add the preset [Rebase onto factors line]

* Traitor Deathmatch: Being a human head or other not-quite-fully-animate object counts as dead. [ROFL]

* Traitor Deathmatch: Add redemption machine (but it doesn't work) [ROFL]

* Traitor Deathmatch: Map in redemption machines [ROFL]

* Traitor Deathmatch: Make the rounds end properly [ROFL]

* Traitor Deathmatch: PDA redemption works [ROFL]

* Traitor Deathmatch: New redemption machine sprite ( @Tomeno )

* Traitor Deathmatch: Get rid of redundant using

* Traitor Deathmatch: Change scoring, prevent redeeming your own PDA, fix bug where PDAs are not tagged with their owner names

* Traitor Deathmatch: Better messages, change cvar name, don't count ghosts for spawnpoint selection
2020-12-13 16:00:49 +01:00
Peter Wedder
b81b8612b6 Add Botanist, Warden, Quartermaster and Chaplain (#2402)
* Add Botanist, Warden and Quartermaster

* QM ID card, warden sprite state

* Add missing sprites

* Chaplain + some fixes

* typo fix

* capitalization

* copyrihgght

* add spawnpoints
2020-10-27 21:28:39 +01:00
Swept
4f00acbb69 Fixes icons for lockers, guns and flare. (#2247)
* Pistols

* Fixes gun icons

* Fixes all locker sprites

* Moved cursed locker from fills

* Fixes flare icon
2020-10-14 10:58:07 +02:00
Exp
47ba7fc690 Crayons (#2132)
* -Added Crayons + CrayonBox
-Can set any crayon state and color
-Added CrayonDecals

* Allows to cycle through decals (not the final thing)

* ItemStatus

* -UI (WIP)
-Selection thing works
-Changed some shitty state names

* -Icons
-Changed decal name

* Pure Texture Grid

* Charges

* -Reach check
-Toggle interface on use

* Can't draw on windows anymore

* UI now shows selected decal and color

* -UseSound
-Nullable

* Remove unused imports

* -Rotation
-Made decal abstract

* Remove some duplicate images

* Space Cleaner cleans

* Loc Title

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Review adressed

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-10-13 13:40:05 +02:00
Swept
552918d59d TABLE TIME LET'S GET ITTTTTTT (#2141)
* Replace pilot chair with a better sprite

* Refactors furniture.yml

* Cleans up dumb indentations

* Massive table cleanup YEAAHAHAAAHAHAHA FUCK YEAH WE CAN GAMBLE NOW

* Bookshelves, rack, metal shelf

* Actually good looking carpets holy crap lois

* three more colored carpets

* Rest of carpet colors and they now have proper drawdepth

* Adds Phoron windows and recolor phoron gas

* A bunch of decorative lights

* CarpetBase now abstract

* Inhands for torches

* Tables now have icons and a much nicer rsi/yaml layout

* Carpet Icons fix

* Removes old carpet
2020-09-29 16:11:42 +02:00
Swept
1638c366cf General tweaks (#2109)
* Removes a bunch of old Eris shoes

* Changes the jackboots sprite to tgstation's

* Prototypes nuked

* Removes walk sound from jackboots, it was pretty annoying

* Adds wood table icon

* Adds wood plank and spawns it on wood table destroy. Also removes tg hand tele sprite.

* Removes weird mask png

* Removes bad pixel on security backpack

* Adds filled utility belt to engineer and ce roles

* Update Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-09-21 01:14:19 +02:00
Swept
c7037c2293 Fixes a ton of sprite icons. (#2034)
* Icons + Sprites for Atmos pipes

* Fixes Mimic icon

* Fixes rsi for RnD point source

* RnD Point source prototype fix

* Centers Bike Horn icon

* Centers pirate hat sprite

* Centers a bunch of milkshake icons

* Moves light_bulb.yml to Constructibles

* Fixes light_tube icons

* Emergency Light icon fix

* Medical Scanner icon

* ID Rsi fixed

* ID cards now have proper icons

* Lockers have proper icons finally

* Default Icon Fixed

* Resolved lighting issues
2020-09-13 13:53:47 +02:00
nuke
c3630b7301 Glowsticks, flares and lighting behaviours (#1886)
* Assets

* LightingBehaviours, flares, and such.

* More changes

* More changes, more flare work.

* More work on flares + light behaviours

* another refactor

* missed

* Light behaviours refactor, added sfx, improved graphics, improved lighting effects for glowstick and flare.

* remove unneeded value

* nullables

* remove old code

* nullable

* one last push

* net id

* more work

* more colors for glowsticks

* Adjust flare so it fades in

* fix name

* sprite fix
2020-09-03 22:02:40 +02: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
nuke
a62935dab2 Handcuff system (#1831)
* Implemented most serverside logic

* All serverside cuff logic complete

* SFX, Clientside HUD stuff, Other logic.

* fffff

* Cuffs 1.0

* missing loc string

* Cuffs are stored in the balls now.

* Basic integrationtest

* Support stripping menu.

* rrr

* Fixes

* properties

* gun emoji

* fixes

* get rid of unused

* reeee

* Update Content.Shared/GameObjects/ContentNetIDs.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-08-25 14:54:23 +02:00
SoulSloth
7664b30951 Add a fire extinguisher (#1685)
* added a lantern

* Add A Lantern with radiating light

* Added a GasVapor system and made a base for extinguisher spray.

* switched to using solution component for fire extinguisher

* made it so fire extinguisher's can run out of water vapor

* Added actual Gas to Gas Vapor, now getting atmosphere for touched tiles.

* Made it so gasVapor reacts and dissapates on reacting

* GasVapor now dissapates exponentially while traveling

* Added in-hands for fire extinguisher

* Added Spraysound to gasSprayer and to fire extinguisher prototype

* parameterized GasSprayer and GasVapor

* removed un-used imports in gasSprayer and gasVapor components and systems

* removed accidential threading import into gasmixturecomponent

* add a shared extinguisher component for extinguisher spray rotation instead of piggy-backing on RogueArrow

* paremeterized fuelCost and fuel name in GasSprayerComponent

* Paremeterized gasAmount, removed un-used code from gasVaporComponent

* Removed BaseItem Parent from Extinguisher_spray

* added GasVapor and GasSprayer to Ingored Components list

* reduced offset of spawned extinguisher vapor from player

* Update IgnoredComponents.cs

* renamed SharedExtinguisherComponent to SharedGasSprayerComponent and removed reference to RoguePointingArrow

* renamed shareExtinguisherComponent to SharedGasSprayerComponent

* Update Content.Server/Atmos/GasSprayerComponent.cs

Added check for solution component on GasSprayer.

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

* Update Content.Server/Atmos/GasSprayerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-08-18 17:45:49 +02:00
Swept
33ed9eea82 Finished dark souls carvings (#1383) 2020-07-12 22:49:20 +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
Swept
ebebb3603a Added a buncha bloat from teegee (#1203)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-02 16:05:03 +02:00
Pieter-Jan Briers
290b3595bc Handcuff props. 2020-04-24 14:59:03 +02:00
Swept
3e9b93faee Adds Skub (#740)
* Added Skub

* Added Skub crafting recipe
2020-02-28 14:58:25 +01:00
py01
b2b8021d9b Adds rsi sprites for bureaucracy items, fixes pen and paper spri… (#711) 2020-02-17 00:16:06 +01:00
adrian
9544099c99 Paper and pen (#582)
* A very basic paper and pen implementation

* Removes SharedWriteComponent

* Update ContentNetIDs.cs
2020-02-12 00:01:05 +01:00
Swept
66c327805f Added a bunch more textures (#356) 2019-09-24 22:15:26 +02:00