Commit Graph

506 Commits

Author SHA1 Message Date
Swept
74d044a4a9 Adds more splat and tweaks PuddleComponent.cs (#3942)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-05-21 00:19:18 +00:00
SweptWasTaken
00c844a410 Fixes holes in Captain's jumpsuit and adds Captain's jumpskirt 2021-05-20 09:21:48 -07:00
SweptWasTaken
00b0760db3 Updates a lot of clothing inhands 2021-05-09 18:34:38 -07:00
SweptWasTaken
a749d95f97 Fix glass sheet inhands 2021-05-08 16:16:06 -07:00
Swept
55a04bfc30 Cleaned up all produce meta.jsons (#3943) 2021-05-08 09:09:35 +00:00
SweptWasTaken
d45b0a4907 Removes a vestigal plate 2021-05-07 23:28:12 -07:00
SweptWasTaken
16daf3ed17 Adds inhands for matches 2021-05-05 13:52:30 -07: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
84d83d1902 Slight fixes for sabre and machete inhands 2021-04-28 16:31:47 -07:00
TaralGit
ebec1b7dcf Inhands for pistols, beakers, reworked melee weapons and laser gun (#3887)
* new pull

* beakers

* melee

* ffs

* hope this works

* ffffff

* Update meta.json

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-28 21:14:27 +00:00
SweptWasTaken
0976755eb0 Minor RSI fixes and corgi hide name 2021-04-22 12:11:48 -07:00
Swept
465eaa87d3 Deprecates DrinkFoodVisualizer.cs in favor of SolutionContainerVisualizer.cs (#3876)
* Initial

* Removes DrinkFoodVisualizer.cs

* Tests
2021-04-21 21:12:37 +00:00
ike709
055059ab5c Chairbender Chat (#3794)
* #272 restructure and restyle chat line edit section

* #272 no arrow, actually change id on channel changer

* #272 nice round chat channel picker

* #272 add chat channel selection logic, and auto-select
when a prefix is entered

* #272 consistent width of chat channel btn

* #272 only show admin channel filter if asay perms

* #272 add tutorial info on chat prefixes

* #272 added chat filter button

* #272 added chat filter button

* #272 WIP on filter popup

* #272 fix filter popup pressed / unpressed logic

* #272 fix filter popup positioning and layout

* #272 WIP channel filter logic

* #272 WIP channel filter logic

* #272 WIP refactoring how chatbox / manager manages available filters and channels to send on

* #272 WIP implementing filtering UI / logic
and refactoring how chat UI is managed

* #272 fix various bugs with new chat filter / selector logic

* #272 remove outdated todos

* #272 WIP working chat window resize

* #272 bounded chatbox resizing

* #272 alertUI moves with resized chat

* #272 WIP making alertUI not be too large when changing size / UIScale

* #272 WIP fixing window / uiscale adjustment

* #272 WIP hacky approach for resizing, will try another approach

* #272 implement hacky approach for bounded chat resize

* #272 no resizing of lobby chat

* #272 WIP adding unread marker to chat filters

* #272 basic working unread chat message indicators

* #272 WIP adding horizontal channel selector items

* #272 horizontal channel selector popup

* #272 workaround for chat selector staying highlighted when right clicking it while toggled

* #272 workaround for chat selector staying highlighted when right clicking it while toggled

* #272 wip trying to add tests for chatbox

* #272 remove test, not really possible with current system

* #272 merge latest

* #272 merge latest

* #272 fix csproj changes

* It works if you disable the lobby

* Fixes lobby chat

* Adds more channel focusses

* Channel cycler

* Address review

* Address nitpicks

* Address more of the review

* Fix chat post-viewport

* Finalize review stuff

Co-authored-by: chairbender <kwhipke1@gmail.com>
Co-authored-by: ike709 <sparebytes@protonmail.com>
2021-04-20 16:39:39 -07:00
Swept
050e170ad8 Updates crowbar.rsi with actual copyright/license 2021-04-17 23:17:11 +00:00
Swept
b9d9f01d39 Cleans up janitorial content (#3802)
* Initial

* Adds a drawdepth for hydroponics

* Maps 2 buckets in

* Moved the bucket into it's own yaml

* tg sprites for bucket and you can put it on your head now

* Cleanup timegit add . !

* Applied Reviews

* Attempts to revert the changes to Saltern
2021-04-15 21:21:10 +00:00
Swept
0cccde9126 Ammunition boxes code quality (#3790)
* Boxes

* Reorganizes the YAML

* Reverts to previous commit and fixes the icons.

* Readds the new CLRifle.rsi as it'll be used soon.

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-04-15 21:15:12 +00:00
BulletGrade
17739f4fdf Add BarDrobe and Bar Backroom into Saltern (#3843)
* Add BarDrobe

* Add Tophat and beer goggles into BarDrobe

* Add bar backroom

* Fix license

* Fix roundstart atmos

* Refactoring and using specific commit for meta.json

* Add black shoes into BarDrobe

* Update meta.json to standard

Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-15 18:24:55 +00:00
ike709
69dbb9f654 HUD Themes (#3774)
* HUD Themes

* Prototypes

* field

* oops

* ugh

* Fixes

* Update Content.Client/UserInterface/GameHud.cs

Co-authored-by: ike709 <sparebytes@protonmail.com>
2021-04-12 00:43:53 +02:00
TaralGit
478dab4b88 Reworked sprites, inhands and new melee weapons (#3691)
* reworks

* added the rest

* reworked the machete handle

* reworked the icon for the machete

* ok. last one

* .

* .

* replaced machete and knife sprites (again)

* the meta.json

* license

* ffs

* final

* bs

* .

* .

* got rid of the machete and bat

* fuck

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-04-10 16:34:45 +00:00
Swept
252881776d Adds some more toollists and debug entities (#3807)
* Adds upgraded tools to surgery and construction tools list

* Adds cow tools entity list

* Adds admin multitool

* Removed cowtools entitylist

* Merge

* RSI Validator doesn't cry now
2021-04-10 07:25:12 +00:00
Alex Evgrashin
cfe427eb8c Light replacer (#3701)
* Add graphics

* Barebone light replacer

* Now light replacer stores bulbs

* More interactions

* Added text messages

* Better light refil

* Add light replacer to locker and lathe

* Added sound

* Fixed ignore error

* Better inhand

* You don't like this commas?

* Fixed typo

* Deferring spawning

* Moved interaction logic to system

Co-authored-by: Alex Evgrashin <evgrashin.adl@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-04-08 22:28:06 +10:00
Swept
5387f87608 Fixes all vending machine copyrights (#3798) 2021-04-05 14:52:09 +02:00
Swept
b5f6f43aaa Fixes pie cannon (#3797) 2021-04-04 13:13:19 +02:00
Swept
685f7008a6 Makes organs consumable (#3754)
* Slightly reorganizes Body yaml

* Slightly reorganizes Body yaml

* You can now monch all organs

* Rewrites Mobs/Species/.rsi meta.jsons and replaces some human organ sprites

* ReIDs organs and does some more cleanup
2021-04-02 15:44:02 +02:00
Peptide90
df70984c52 Adds more mob crates for livestock (#3604)
* Adds livestock crate sprites and cargo crates

Goat and butterfly

* Sorted NPC crates. Added more mobs

Alphabetized NPC crates & Cargo_livestock
Added all current mob crates to cargo.
Added remaining mobs as crates.
Fixed .rsi naming
Added descriptions to livestock crates
Added construction graph for crates under new category "storage"

* Added bees, chickens and gorillas

NPC Crates for cargo

* Fixed cargo console icons

* Alphabetised NPC animals

* Randomizer comment

* removed livestock from cargo console

* Fix chickenmob

* Update yml

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-04-02 21:41:00 +11:00
Swept
587d3fa7b9 Debug SWEPs (#3755) 2021-04-02 10:54:08 +02:00
Pieter-Jan Briers
d5d4f434c1 Merge pull request #3718 from SweptWasTaken/swepthud 2021-04-01 23:24:39 +02: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
SweptWasTaken
861e07a953 E 2021-03-28 17:56:01 -07:00
SweptWasTaken
861cf80c04 Tweaks and added a layer folder 2021-03-28 16:53:30 -07:00
SweptWasTaken
d8996c05b6 More tweaking 2021-03-28 16:39:33 -07:00
SweptWasTaken
6f59fe6a7b Flips the hands 2021-03-28 16:28:42 -07:00
Pieter-Jan Briers
0ac4c0e85c SKREEEEEE (#3706)
* Import bird sprites and define basic mob.

* SKREEEEEEEEE

* Move hair styles to new sprite accessory prototypes.

Basic stuff, no multi-species stuff yet.

* Vox hair styles and clothes

* Make HumanoidCharacterProfile.Default() a static default to fix tests.

Usages that wanted the previous random behavior now call Random().

* Remove names from hair style prototypes.

(They're in localization files)

* Update Content.Shared/Actions/ActionType.cs

(sk)reeee github

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-03-28 17:26:32 +11:00
SweptWasTaken
3997b06cd2 meta.json commented out for ike-ui 2021-03-26 10:46:22 -07:00
SweptWasTaken
2824a6952c Initial 2021-03-26 10:45:38 -07:00
ike709
1d052d0410 Improves the HUD (#3655)
* All good except the combat doll

* Makes the HUD inventory less terrible

* Cleanup, nuke the Combat Mode button

* Harm icon

* Switch the icon

* Basic goon hud

* Toggleable

* Nuke the popup, properly centers it

* Fix clicking the button

* Nuke some old code

* missed a comment

* Remove defaults

* Localization

* Nuke some old yaml

* New sprites

Co-authored-by: ike709 <sparebytes@protonmail.com>
2021-03-27 02:23:12 +11:00
Swept
29d02a3740 Attempts to fix all physics bugs at once (#3610)
* Fixed Rack/Shelf

* Fixes bookshelf, bed

* Placeable for beds for bedsheets

* Bunch of Physics changes, ask metalgearsloth about em'

* More modifications

* More

* Other stuff

* Organizes entities yaml a little bit

* Something new

* Fixed, happy with the state of this rn

* A

* A

* Ye

* E

* Done for now...

* Applied Reviws

* Changes

* Fix the robust commit

* Fixes tests?

* E

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-03-26 12:51:26 +11:00
Vera Aguilera Puerto
d505ce1409 Adds creampie launcher 2021-03-21 18:08:42 +01:00
Swept
20fd7bb5a9 Adds more surgery tools and resprites existing (#3631)
* Initial

* Fixed map/issues

* Touchup

* Fixes tests

* Fixed tests

* Fixed RSI Validator

* Fixed RSI Validator

* Fixed

* FD

* FD

* FD

* Killed rogue inis

* netsync

* Update submodule

* Lint

* Lint

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-03-16 08:48:54 +01:00
TaralGit
08f44050fe Laser gun for security (#3632)
* laser gun

* filled up the energy depletion overlay

* small sprite correction

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-03-15 10:53:16 +01:00
ShadowCommander
612b0fa254 Fix light_tube.rsi broken burned and empty left and right facing sprites (#3673) 2021-03-14 22:40:25 -07:00
Pieter-Jan Briers
70e2648fa0 Verb icons now UI scale. 2021-03-14 14:40:14 +01:00
Swept
3dba752193 Adds a bunch of UI icons for verbs. (#3007)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-03-14 14:23:32 +01:00
Swept
9a604e38d6 Updates chemistry layout on Saltern (#3658)
* Adds content

* Maps

* Fixed
2021-03-14 16:24:22 +11:00
Vera Aguilera Puerto
ab4b275247 Revert "Changes chemistry to be more secure for now (#3649)" (#3651)
This reverts commit fc9a62581b.
2021-03-13 13:54:48 +01:00
Swept
fc9a62581b Changes chemistry to be more secure for now (#3649)
* Adds content

* Maps
2021-03-13 20:27:53 +11:00
Peptide90
0a34c4b8a9 Adds construction for wooden barricades, solar panels + solar trackers (#3472)
* Added barricades and textures for hidden doors

Constructable barricades and textures for square wall hidden doors

* Added solar assembly & tracker. Restructured power construction

Added solar tracker and assembly construction and textures. (Trackers don't work at present).
Moved APC and solar item sot construction/power.yml
Moved power based items to "Utility" in construction menu.

* Localisation changes

Added flammable to barricades.
Added localisation to barricades and all solar entities.

* Removed hidden doors

Removed .rsi for hidden doors as wasn't able to get non airlock doors working.

* Adds solar crate to cargo

* Fixed tests

* Removed glass from solar crate

Removing glass from solars crate until stacks can be specified.

* Added deconstruction to solar graphs

* Added deconstruction to barricade

And fixed nodes for solars.

* Fixed materials

* Fixed meta indent and solartracker type

* Fixed materials, physics & naming

Added new physics fixtures to barricade and solars
Changed solar tracker board to electronics.
Changed material ID for destruction of wooden barricades to new ID.

* Changed back to prototype from component step

Component step does not work for electronics only machine boards.

* Localisation fixes 1

* yaml linter fixes

Removed obsolete code

* Update meta.json

* Fix trailing comma

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-03-12 22:11:06 +01:00
Swept
bf99a91507 Revert "Revert "Slight changes to spawners"" (#3627)
* Revert "Revert "Slight changes to spawners (#3605)" (#3624)"

This reverts commit 8c01d9d9dc.

* Bring back clicktest.yml

* Update IgnoredComponents.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-03-12 21:28:40 +01:00
metalgearsloth
8c01d9d9dc Revert "Slight changes to spawners (#3605)" (#3624)
This reverts commit a47e1b817c.
2021-03-12 20:22:33 +11:00