Commit Graph

11 Commits

Author SHA1 Message Date
DGamerL 098b13bb33 Removes the empty type of /snacks (#26010)
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-29 14:46:04 +00:00
BiancaWilkson 1fae459c26 Fixes gatfruit seed's description (#25912)
* Fixes #25745

* More descriptive
2024-06-14 03:25:30 +00:00
Charlie Nolan 3c043374d1 Botany rework V2 (#24342)
* 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>
2024-04-15 20:29:49 +00:00
Charlie Nolan a881e11c86 Many botany QoL changes. (#25031)
* Many botany QoL changes.

* Give observers a plant analyzer.

* Hooks should be executable.

* Upgraded Seed Extractor GUI.

* Left-align seed extractor, more efficient icon sending.

* tgui rebuild

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* 's' properly

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-04-15 19:58:09 +00:00
S34N 0b838dc3c4 [READY] BYOND 516 compatability (#25105)
* Preliminary changes for 516

* Also removes the goon folder

* Fixes a BUNCH of UIs

* update our things

* debug proc

* le maintainer verb

* fix strip panel

* browseroutput => chat_panel

* prettier, remove obsolete bat

* tidu tgui say css

* href purge

* 515 compat

* 515 compat 2

* more required chores

* comments

* fully working 515

* bungle

* correct this

* fixes 515 support

* prettier

* new CI

* fixes old href styles sneaking in

* update docs to reflect href changes

* more href fixes (thanks cdui)

* MORE href nonsense

* even more hrefs (seriously wtf)

* Update code/modules/admin/permissionverbs/permissionedit.dm

* error on fail

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-04-15 18:49:50 +00:00
CRUNCH ba0797c48f Adds Lettuces. Reworks a number of recipes. Roborgers no longer taste of lettuce. (#24870)
* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Cabbage purge, lettuce supremacy

* Update code/modules/food_and_drinks/recipes/recipes_microwave.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* updated a comment

* Cabbage Restoration

* Lettuce sprite

* Egg wrap

* readd lettuce sprite post-conflict

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
2024-04-12 18:40:49 +00:00
chuga-git df8fef119d Ports TG bamboo and Punji Sticks (#24497)
* 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>
2024-04-07 09:38:10 +00:00
DGamerL db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
DGamerL fa455fe213 Changes the revolver obtained from gatfruit to an overgrown revolver (#21320)
* gatfruit more like gattofruit

* increases max ammo to 8

* bio is not a valid research

* small issue

* adds a missing space

* gatfruit takes time to open now

* Sirryan's request

* adds the sprite

* lewcc review + sprites

* ghhhhhh

* sprites are working
2023-07-15 14:42:10 -05:00
Kyani 87201198ef fixes cherry bombs (#20921)
* fixes cherry bombs

moves prime to AFTER the auto-throw is toggled
added a sleep before the explosion trigger to prevent instant explosions
reafactor'd black powder to explode at its container's location instead of where the black powder's trigger is, to prevent desync between the explosion location and a thrown object

* removed sleep

mistook the desync before as an instant explosion. now that desync was fixed it is shown to not be needed

* Update code/modules/hydroponics/grown/misc_seeds.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* comments added

* renames location to prime_location

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-05 21:21:11 +02:00
AffectedArc07 b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00