Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,532 Commits 1 Branch 0 Tags
75a8833b2cbe847aa1040b30e72b08025249a3a2
Commit Graph

1690 Commits

Author SHA1 Message Date
Visne
75a8833b2c Add AdvertiseComponent and add it to vending machines (#3756) 
* WIP AdvertiseComponent

* Add AdvertiseComponent and add it to vending machines

* Add snacks.yml

* Capitalise C in cigarette machine

* Update Content.Server/GameObjects/Components/AdvertiseComponent.cs

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

* Update Content.Server/GameObjects/Components/AdvertiseComponent.cs

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

* Fix most problems

* Add localisation + exception for illegal prototype values

* Add ads for smart fridge, discount dan's, youtool and mining

* Oops

* Fix style

* Make dependencies local

* Remove some ads, increase wait

* Increase wait, allow full initial wait width

* Fix error

* Update sovietsoda.ftl

* Update sovietsoda.ftl

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-04-21 20:00:14 +10:00
SweptWasTaken
2250926457 Adds Atomic Amnesia MMX to the lobby music. Thanks 3kliksphillip! 2021-04-20 23:33:50 -07:00
PJBot
7b3243cc3a Automatic changelog update 2021-04-20 19:40:41 -04: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
PJBot
d7d37f10d1 Automatic changelog update 2021-04-19 03:53:43 -04:00
Pieter-Jan Briers
147a54c642 Viewport improvements (#3765) 2021-04-19 09:52:40 +02:00
PJBot
8e2fc49357 Automatic changelog update 2021-04-19 03:49:27 -04:00
Pieter-Jan Briers
e0f628db92 Shadow casting changelog entry. 2021-04-19 02:09:59 +02:00
Pieter-Jan Briers
4c99420bf7 Fix emergency light offset. 2021-04-19 01:43:18 +02:00
PJBot
5e42812c27 Automatic changelog update 2021-04-18 04:04:33 -04:00
Swept
050e170ad8 Updates crowbar.rsi with actual copyright/license 2021-04-17 23:17:11 +00:00
Swept
682b36ae23 Wall YAML cleanup (#3864) 
* Code Quality

* IDs and mapping

* Construction Recipes
 2021-04-16 06:47:18 +00:00
SweptWasTaken
930e1e2acb Wiring near HoP office - Thanks Timrod! 2021-04-15 22:43:42 -07:00
SweptWasTaken
6ec152e483 Moves ReagentDispenser Inventories to Catalog 2021-04-15 22:36:41 -07:00
PJBot
eecbb6d81f Automatic changelog update 2021-04-16 01:29:11 -04:00
Swept
f4f068333e YAML Code quality and name fixing (#3850) 
* Table debug

* Ports everything from old PR
 2021-04-16 05:28:08 +00:00
Visne
9bac345d3f Removes Sales vending machine inventory (#3852) 2021-04-16 01:12:28 +00:00
Vera Aguilera Puerto
d978641db2 Add debug rotation marker prototypes 
They used to live in the engine, before.
 2021-04-15 23:25:32 +02:00
PJBot
4ea783511e Automatic changelog update 2021-04-15 17:22:12 -04: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
PJBot
971ee7b1df Automatic changelog update 2021-04-15 17:15:49 -04: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
Swept
c772987bde Gas canisters HP buffed and now spawn broken version (#3791) 
* Initial

* Fixed Build
 2021-04-15 21:14:47 +00:00
Peptide90
3c878779ae Buffed hardsuit light to last longer and recharge (#3816) 
* Created power cell for hardsuit helmet

Self charges over 5 minutes and gives 10 minutes of total light time.
Extended flicker period due to recharge so lots of low power warning.

* Made helmet battery non removable
 2021-04-15 21:14:22 +00:00
BulletGrade
eb9f2117c2 Add small lamp into service maintenance (#3849) 2021-04-15 20:02:22 +00:00
PJBot
d5ab3e32c1 Automatic changelog update 2021-04-15 14:25:57 -04: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
PJBot
30d5b58319 Automatic changelog update 2021-04-13 06:58:31 -04:00
metalgearsloth
dc48b25a3b Named fixtures for banana peels (#3822) 
* Named fixtures for banana peels

* Soaps and PDAs

* Update submodule
 2021-04-13 20:57:29 +10:00
PJBot
233c779181 Automatic changelog update 2021-04-12 20:33:22 -04:00
ike709
f0fc33a01a Adds a library to the saltern (#3831) 
Co-authored-by: ike709 <sparebytes@protonmail.com>
 2021-04-13 00:32:20 +00:00
BulletGrade
beb5fa90ac Add mask of joy into theater vending machine (#3837) 2021-04-13 00:32:02 +00:00
PJBot
e2ad152a6d Automatic changelog update 2021-04-12 09:02:19 -04:00
PJBot
ef863fe471 Automatic changelog update 2021-04-11 18:44:56 -04: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
SweptWasTaken
85d0b57f8b Fixes organs being unconsumable 2021-04-11 11:16:13 -07:00
PJBot
67e7d49806 Automatic changelog update 2021-04-10 12:35:47 -04: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
Vera Aguilera Puerto
009870116d Nodes in entities are now named. (#3825) 2021-04-09 20:47:31 +02:00
Vera Aguilera Puerto
c28f22ebff Removes chem. and react. from every prototype ID (#3767) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2021-04-08 23:48:02 +10:00
PJBot
c8839127f2 Automatic changelog update 2021-04-08 08:40:52 -04:00
PJBot
974e60eec1 Automatic changelog update 2021-04-08 08:29:08 -04: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
c7482140e1 Nukes any mention of CollisionGroup.Clickable (#3782) 
* Initial

* Typo

* Update integer references

* Applied Reviews

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-04-08 21:44:20 +10:00
PJBot
3102778c93 Automatic changelog update 2021-04-06 15:07:27 -04:00
MehimoNemo
1d4df2606d +3 lathe recipes 8===D (#3812) 
* Adds some lathe recipes for a few circuit boards

Does this mean I can call myself a video game dev now. Recipes can be tweaked and stuff if needed
Issue #3544 
Lathe stuff :)

* Big Huge Changes To Lathe

Makes lathe able to craft 3 circuit boards

* +3 Circuit Boards to electromag research

* fixes icon sprites

* fixes textures for realsies

* Update Changelog.yml

* Unfucked changelog

I guess it's automatic

* Revert "Unfucked changelog"

This reverts commit b877188b1fc7928d618f27ef5a8d2c4b6d011523.

* Revert "Update Changelog.yml"

This reverts commit d31ef05b11d72f6781f563658e24083b8a14019d.

* Tweaked resource costs
 2021-04-06 21:06:24 +02:00
DrSmugleaf
677706b117 Refactor body component to use slots instead of an army of dictionaries (#3749) 
* Refactor body component to use slots instead of an army of dictionaries

* Update vox

* Replace static method call with extension

* Add setpart method, replace dispose with shutdown

* Fix tests, fix not listening to slot events when setting a part
 2021-04-05 14:54:51 +02:00
Swept
5387f87608 Fixes all vending machine copyrights (#3798) 2021-04-05 14:52:09 +02:00
PJBot
f46ad7c12d Automatic changelog update 2021-04-05 08:09:47 -04:00