# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.
I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.
I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.
Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.
Ready for merge.
* removes the block chance from the Roman Shield.
* replaces the Roman Shield in the autodrobe with a toy version with no block chance.
* replaces the armoured roman helmets from the autodrobe with fake ones.
* sucessfully fixes some grammar
/🆑
grammar:fix
🆑
* fixes kevin spelling words in albanian
* tfffaerfvvjjewwaazcb
* does this work
* what if this works
* sdad
* ok
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
* Adds Hypospray kits, fixes reagent overlays
Also adds colors to trek chems other than PINK.
* reee admins.txt
* adds the CMO Hypo MK II kit to the CMO's locker
renames the locker overrides as well, because lazy
* grammer gud
* hypo vial fix suggested by Kfive
* Modifies hypospray functions
* Fixed the Hypospray mk.II, is now comprehensive where it must.
* Fixed bugs, including the vending machine problem.
* Either fixed or didn't fix line terminator issues.
* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.
* Forgot a comma.
* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.
* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.
* delay tweaks. otherwise all good.
* reee github
* unneeded \the I thought were purged
* grammar fix, gives MDs and Chemist hypokits
* Makes chem masters able to produce vials
* recompiles tgui
* Update belt.dm
* Engie goggles in Meson mode now respect light levels (#36504)
* Engie goggles in Meson mode now respect light levels
Meson glasses show the surrounding terrain, but darken areas beyond line of sight and that are not lit. Engineer goggles set to Meson mode currently show all terrain at max brightness. As a result, it can be hard to even know an area is unlit until objects (or mobs) suddenly start popping in one tile away.
This change makes the Engineer goggles respect light levels like Meson glasses do.
An image for visual aid;
https://i.imgur.com/KdYmkZb.png
Left shows the current Engineer goggles. Right shows the current Meson glasses, and how the Engineer goggles will look with this change.
* Update engine_goggles.dm
* Engie goggles in Meson mode now respect light levels
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl
Fixes#36444
From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.
This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.
I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
