* Added saltpeter crystal, a way to make them, and sprites.
* comment changes
* forgot to undef
* actually undefing this time
* raises saltpeter crystal yield when ground to 8
I did some play testing and it simply takes too many clicks to pump in the ammonia required to get the amount of saltpeter you need.
* The compost bin being full of compost no longer hinders your saltpetre production
* rebuild TGUI
* Allows the compost bin to accept ammonia directly from plants that contain it
* adding the K back to KNO3
* Minor ui adjustments
* Compost bin can use ash now
* I am made of stupid.
* fixing a tiny little offset in the biomass bar
* Icon update, new description for Saltpetre crystals, style fixes and recompile tgui
* period
* minor changes
* rebuild TGUI
* Apply suggestions from code review
Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com>
---------
Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Adjusts grinder behaviour and towercap log contents
wood logs now contain 20 carbon, and the plank carbon amount is reduced accordingly, steel logs now contain 50 iron, non-edible plants are ground the same way as edible plants.
* Rearranged checking for grinding behavior to if else from nested if and removed the old non-edible plant grinding code.
* additional check on strain length
* Updated fix and bundle build
* Refactor of ui_data
* Removes unused variable
* style adjustment
* Revert to original fix, QoL adjustments
* Diverse Traders Types
* Trader Type control, announcements, species spawning
* Trader Outfits
* Posh Moth - Posh Cane
* Landmarks, Trader ID Name Change
* Trader Shuttle Adjustment - Landmarks for Item Pools
* Outfit Survival Kit changes
* Added another refill for the hand labeler due to more cargo
* Trader Shuttle locker fix
* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle
* Mech access, No double mechs, Small box fix
* Removed Solgov Gunkit from General Pool
* Spacing
* Moved traders to not be event subtypes, added documentation to vars
* Boxed spacing, removed improper
* Moved postequip, used box variables
* Lore team requested change - Bolt action instead of AK
* Changed landmark
* Moved soviet ammo to minor gear, increased soviet minor gear to 8.
* Obfuscated Cybersun
* Lootpool Adjustments
* Readded Solgov Kit to general pool at low weight
* Commas!
* Spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Re-Nulled After_Equip_Job
* Removed extraneous var spaces
* Relocated space in trader introduction message
* Robomoon is now once again Cybersun
* Impropered Enforcer Kit
* No more ERT box for non-NT boxes
* Fixed turbine kit stock part amount
* Subtyped skrell/unathi suit boxes
* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons
* Reduced weight on arm/esword implant rare items
* Also reduced arm laser weight
* Added a couple items to skipjack large - more 'random', filled in reduced weights
* Path typo fix
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* starts it
* Update magic_tarot.dm
* MORE PROGRESS
* So many thanks to Cloudbucket, for sprites
* The Work, the Art, continues.
* more changes
* pushes the Work foward. All cards done.
* and more thanks github
* adds to BSH
* tochat
* Finishes QWERTYTODO. Magic key. World smoke
* Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.
* nanny bag it before I forget
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* RE-RE-RE-REVIEW
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* requested changes and such
* duh
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Update code/datums/status_effects/buffs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* new hrefs here to troll CI :trollface:
* Update code/game/gamemodes/wizard/magic_tarot.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb6.
* More changes that compile and work
* IT WORKS AAAAAA
* Changes even more .len to length()
* Apply suggestions from code review
* Update code/datums/mind.dm
* Update code/__HELPERS/sorts/InsertSort.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Many botany QoL changes.
* Give observers a plant analyzer.
* Hooks should be executable.
* Completely new botany mutation mechanics.
* Minor fixes, changed vendor contents.
* Add charcoal to NutriMax extended inventory.
* Lint.
* Reset somatoray beam effects in a few more places.
* Mapped in seed sorting trays and mutrient.
* Slimmed down the seed sorting tray.
* Update unsorted seeds with analyzer, ghost-analyzer, and HUD support.
* Make english_list null-safe (and slightly faster).
* Fixed a mutation focus bug, added plant anayzer attackby to unsorted seeds.
* Made self-sufficient trays display their nutrient as Earthsblood.
* Improved descriptions and on-use texts.
* Added 5 dropers and 3 seed sorting trays to NutriMax.
* Mark stuff as notices, special case for duplicate doping.
* New way to get kudzu, QoL changes.
* Yield somatoray adds a message to the yield stat.
* Unsorted seeds produce a message when you try to put them in a tray or
machine.
* Potassium iodide and pentetic acid will now neutralize the tray's
mutagen.
* Using a plant bag on a seed extractor will now process plants into
seeds if there are no seeds in it.
* Bonk.
* Don't try to extract no seeds.
* Butterfingers.
* Bonk more.
* Add seed sorting trays to perma.
* Upgraded Seed Extractor GUI.
* Do not drop that which you do not extract.
* Don't bug out when removing the last seed.
* You want a tgui rebuild? Have a tgui rebuild.
* Drop trait-adding threshold by 10.
Before:
Needs modified mutation level >50.
With the x2 from 9+ seeds, this happens at base mutation level 25.
With maximum mutation level of 35 (L4Z+mutagen+somatoray), chance was
20%.
Required either L4Z (yield set to 1), or a somatoray (external help) for
any chance.
After:
Needs modified mutation level >40.
With the x2 from 9+ seeds, this happens at base mutation level 20.
With maximum mutation level of 35 (L4Z+mutagen+somatoray), chance is
30%.
Can get 10% chance with mutation level 25 (Mut+mutagen).
* Renamed mutagen level -> mutagen tank
* Left-align seed extractor, more efficient icon sending.
* New sprite thanks to McRamon.
* tgui rebuild
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
* Evil Janitor Cyborg
* Evil Medical Cyborg
* Little less cyanide
* Evil Service Borg
* Combat Cyborg Firmware Upgrade cost adjustment
* Minor code fixes
* Updated Energy Type
* Spacing Changes
* Evil Mining Borg pt1
* Sonic Jackhammer Force, Functions as Combat and Utility mining module
* Moved guitar
* Moved KA
* Naming, Inheritance changes
* Fix landmine stack icon
* Landmine Repath, RSG Magazine Length and KA Overheat changes
* Service Borg Shotgun - Lasershot, Ammo Cap Nerf, No more slug
* REALLY got rid of compact slugs
* RSG - 2u Toxin, 20 Brute heavy syringes
* Syringe Gun Fire Rate
* Changed syringe creation, moved syringe cannon off syringe gun
* Purged syndie hypo, new emag hypo pierces armor/suits
* adds most things
* STOP BECOMING CRLF
* half the sprites ported
* adds floor turfs, hopefully
* adds bamboo stack recipes and parameter documentation for datum/stack_recipe
* adds the crude syringe and sprite
* Revert "adds the crude syringe and sprite"
This reverts commit d949332055.
* adds crude syringe and sprite
* nevermind, goon license moment
* bamboo walls, false walls, and sprites
* caltrops check for shoe thickmaterial flag
* added spear and fixed filepaths
* smoothing and caltrops are even more broken
* Fixes sprite smoothing and caltrop weirdness
* whitespace
* fixes tile stacking
* Henri review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* royal blue and red carpets no longer smooth
* henri review
* actual henri review, thanks git
* Henri review electric boogaloo
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* removes bamboo walls (rip)
* Update code/game/turfs/simulated/floor/fancy_floor.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Extract requests console message sending code.
* Add secondary goals
* Converted supply shuttle to a signal-based system.
* Lint.
* Review suggestions.
* Secondary goals can now check the supply shuttle for their requirements.
* Remove redundant completion variable, undef what we define.
* Made the request console refuse to issue a secondary goal until you finish the current one.
* Made the shuttle blacklist error more specific, added locked/manifest-attached crates to blacklist.
* Added round end secondary goal report.
* Lint
* Add tags to reagents for secondary goals to use.
* Extracted the reagent logic from the bar goal, used reagent tags.
* Added the Variety of Drinks Bar goal.
* Added variety drinks goal for the Bar.
* CC no longer complains about sending stuff in containers, but the shuttle will refuse lockboxes without goal items.
* Allow unlocked lockboxes on the shuttle.
* Added kitchen goals.
* Lint
* More lint
* Add goals for scichem and medchem, pending reagent labelling.
* Added Kudzu goal for botany.
* I forgot to rename them, oops.
* Lint
* Made mechs sellable, configurable goal rewards.
* Balancing changes.
* Added random Ripley goal.
* Add Clear Task Backlog station goal.
* Lint
* Oops.
* did i even do this right
* Lint
* Excluded drinks available from upgraded booze dispenser.
* Such bugs. Much fix. Wow.
* Goal notice formatting.
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Made storage nesting better, improved consistency between storage types.
* Out, er, space.
* Added a proc for sending a requests console message.
* Added error messages to Virology Goals.
Backported a few small things from Secondary Goals to make this easier.
* Extracted out the three-way reward code into a proc.
* Update code/__DEFINES/dcs/signals.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Removed redundant SIGNAL_HANDLER labels.
* Yes, that should be a proc.
* Enforce important parent calls.
* Thank you, DreamChecker
* Undid accidental merge of #24699
* Removed a testing proc that wasn't intended for this PR.
* Removed parts of #24750 that also crept in.
* Made the variety of [x] goals more explicit that they want 50u of each.
* Reduced Kudzu trait requirement to 1.
* Request consoles now output the list of valid departments if you're at an unsupported one.
* Added personal crates.
* Added a supply pack of personal crates.
* Added special cargo handling for personal crates.
* Added automatic personal crate when requesting a goal.
* Required personal crates for most secondary goals.
* Add goal labels to the hand labeler, require them for mech goals.
* Made secondary goals one-per-person, not one-per-department.
* Added support for multi-line system messages to the request consoles.
* Made the RC message for goals nicer.
* Send goal crates even if no normal crates are ready, name and access-lock them properly.
* Don't double-label.
* Let's not use registered_account, names are fine.
* Add a ton of blackbox data to cargo and secondary goals.
* Fix a few bugs.
* More bugfixing, couple more stats.
* Even more stats.
* Text fix.
* Made cargo fines more consistent with other cargo feedback.
* Fixed a bug that prevented non-top-level items from being checked for CARGO_REQUIRE_PRIORITY.
* Blocked large crates from being sent back unopened.
* Enum values should probably be different from each other.
* Correct a bitflag mishap.
* Removed redundant supply shuttle docking and buy/sell attempts.
* Tweak message about personal crates to inlclude that they need to lock it.
* Add /Crates to the Personal Lockers description.
* Less pretty alignment, less complaining linters.
* Corrected a bad name in stats tracking.
* Reduced SciChem variety goal to 5 types.
* Toned down Task Backlog a bit.
* Fixed a bug that made unsellable items nested in containers be stolen by CC (qdeleted).
* Don't require bluespace 8, that's silly.
* Made secondary goals modifiable in the Modify Station Goals UI.
* Whoops, that was supposed to be 600u.
* i ded pls nerf
---------
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Removes the first weird helper
* Removes get_turf_or_move
* Slightly alters the sharp weapon proc
* Adds nullcheck to adjustBruteLossByPart
* Changes `is_dead`
* Adds `hasorgans` to the replaced list
* Update code/__HELPERS/unsorted.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Contra review
---------
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* virus analyzer and WIP virology goals
* bug fixes but not all
* tgui update
* fixed bug
* runtime fix
* small fix
* misc
* virology goals not showing required symptoms fix
* virus analyzer code polish + animation tweak
* removes virus analyzer + tweaks
* adds the health analyzer back
* code polish
* comment edit
* oops, this time resolves merge conflicts
* bigger payout and more goals upon completion
* adds the until now unused vial lockbox
* more code tweaks
* also code tweaks
* yet another code polish
* merge conflict resolve
* virology job_objective
* merge conflict resolve
* grammar
* code polish
* another polish
* forgot these
* oops, how did i do this mapping error
* some but not all code polish and moves vials to fridge because i forgot on map queue, sorry
* finally merging some of the requested changes
* forgot this
* one reguested change left
* merges last reguested change
* failed check asks to rebuild tgui
* most of the reviews
* removes lazyremove, no idea why i used it there
* reviews
* grammar
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* more reviews
* forgot to undef
* deletes old tgui file
* Contrabang reviews
* some of DGamerL´s reviews
* oops
* DGamerL´s reviews
* Update tgui.bundle.js
* stealth virus virology goal now requires 4 symptoms instead of 5
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* cult 1
* massive data refactor
* progress
* More crap
* IM SCARED IT COMPILES
* oops
* more fixes
* good comment
* hell yeah, team control
* lol
* blamo
* blam
* More stuff
* team refactor
* epic merge fail
* src not _src_
* more
* progress
* cult
* more stuff
* water
* goodbye __IMPLIED_TYPE__
* time to undraft
* FUCK FUCK FUCK
* okay this is better
* goodbye todos
* fix
* order of operations
* last fix? maybe
* yeah
* oops
* okay this should be ALL the fixes
* wow
* hell yeah
* wow
* fixes duplicate teams + adds more team safeties
* how the fuck did this happen
* admin objective improvements
* wah more bullshit
* guh
* fuuuuck
* fucking hell
* fixes
* CI
* undef
* hooooly crap
* yeah
* false by default
* fixes
* alright, there we go
* oops lmao
* lol, lmao even
* proper programming
* fix
* losin my mind
* oops
* yeah coloring
* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
* Surely this will not have any critical balance implications
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* oops
* marm fixes
* fixes signal
* how on earth did I do that
* adds twitch to nanocalcium
* respect armor, lowers throw
* IPC can use, fuck up heartless people
* no crawl slowdown / meth
* *slightly* turns down the drug effect
* renames it will deal with pr desc soon
* finishes it
* rnd version empable
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Nerfs twitches visuals, due to a reported novastation bug where the visuals would endlessly stack
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* C-C-C-Changes
* Epilepsy Warning: Drug has vibrant visual effects!
* safety
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* removes twitch name, make mix explode
* oops
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
