* rainbow weed
* Lipolicide
* psicodine + mannitol
* happiness
* ground + dried + smokables
* damn you notepad++
* fix
WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!
* work
* work i beg you
* recipe good
* possibly fix merge conflict
* remove reagents
* moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes
* Revert "moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes"
This reverts commit 45bb8d40150cddbbe005f5d66d34532b79143f98.
* adresses merge conflict
* fixed error
* parents base computer board to base machine board
* Revert "parents base computer board to base machine board"
This reverts commit dec3a799a90b4a0cb121b6694ecf65d9a0abd6a3.
* other thing was causing errors, guess it's this now
* Change emag recipes to print mags instead of single ammo
* Get rid of useless single ammo printing recipes
* Add in submachine gun mags
* missing magazine shotgun beanbag in nonlethal research
* Sort lathes that use ammo crafting recipes alphabetically
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* Printable Empty Magazines
* Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes
* Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab
* Adds fully loaded rifle mags at secfab, removes respective cartridges
* Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab
* Adds fully loaded speedloader to secfab, removes respective cartridges from secfab
* small id mismatch fix
* another wrong ID fix
* capitalize Ls in speedloader
* Add missing SpeedLoader recipe
* Adds fully loaded shotgun drums to secfab, removes respective shells from secfab
* add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well
* Moves tranquilizer shells to the non-lethal ammunition research
* Account for the removal of rubbers, adds in craftable disablers
* rubber rounds don't exist, remove empty non-lethal mags to just have empty mags
* Add in WT550 mags
* Convert latheRecipes to use LayeredTextureRect instead of TextureRect
* Fix for issue, texture layering now works
* Add in missing shell uranium box art
* add shelluranium to meta.json
* Fix yml issue
* Get rid of unused single ammo printing unlocks
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers
Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.
1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.
* Fix references to deleted guidebook entry
* Add fancy button to console because @EmoGarbage404 asked me to
* migration comprete
* Fixed a goober comment
* maint fails to resolve conflicts: more at 11
* Resolve PR comments
* Make UI nice
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Both winter coats with same armor as their counterparts
* Matching description for HoS's, unarmored variants for balancing the uniform printer
* Forgot some text
* New sprite provided by PursuitinAshes, old sprite moved to unarmored version
* Removed the 'unarmored' specifier, in line with the rest of the winter coats
* Remove unarmored warden, no sprite
* Re-implemented the warden's unarmored coat, with sprites from Dutch-VanDerLinde
* CRLF to LF
* Move armor values to abstract
* Added Jukebox, along with music for jukebox
* Fixed Jukebox meta.json copyright
* Removed songs I couldn't find a license for.
* Renamed files to solve check failures from spaces
* Added missing attributions.yml
* Fixed lack of description in Jukebox
* Jukebox is now constructable.
* Change Jukebox menu to FancyWindow
* Moved Jukebox messages out of jukebox component
* Removed Jukebox OnValueChanged.
* JukeboxComp now uses AutoGenerateComponentState
* Removed state code, since it's auto generated
* Fixed various Jukebox code to match conventions.
* Updated Standard.yml to match changed song list.
* fixes
* Jukebox workin
* Fix
* Polishing
* Finalising
* Revert
* bad
* jukey
* Reviews
* name
* Update submodule to 218.2.0
---------
Co-authored-by: iNVERTED <alextjorgensen@gmail.com>
* Fix lockers are not deconstrucable now
Lockers are was deconstructable event when they closed and you didn't have access to them. In short - get stuff by 5 seconds, 5 sec it's time to screw down any locker, except LockerBaseSecure one
* Revert un-destructable lockers fix
Make lockers destructable again
* Fix lockers that deconstructable only when unlocked now
* NoticeBoard is craftable now
* Fix notice board to proper name capitalization
* Fix notice board proper name in description
* Update Resources/Prototypes/Recipes/Construction/furniture.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Adds versions of the holoprojectors (janitoral, fan, and field) that start without a battery and changes the lathe recipe to use these instead. This is consistant with flashlights, which when made do not start with a cell.
Also it's a bit silly to have cargo printing a bunch of these to sell.
* 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
