Commit Graph

2562 Commits

Author SHA1 Message Date
SatinIsle 606107927e Food Preferences (#15850)
* Food Preferences

Ported from roguestar, originally made by VerySoft: https://github.com/TS-Rogue-Star/Rogue-Star/pull/37
Numbers have been tweaked, and the bonus significantly lowered.

Added new neutral traits: Food Preferences.

Foods with the relevant allergens present will give you bonus nutrition, approximately a 25% boost on most foods that I tested.

Only one of these traits can be taken at a time.

* stuff
2024-03-22 03:29:36 +10:00
Heroman3003 f6d0f62622 Revert "Garbage collection, asset delivery, icon2html revolution, and general…" (#15815)
This reverts commit cc05d51b69.
2024-03-10 20:01:05 +10:00
Cadyn cc05d51b69 Garbage collection, asset delivery, icon2html revolution, and general fixes (515) (#15739)
* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Update GC from TGStation

* fixes

* Appease linter

* begone custom_items.txt

* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Build dependencies at 514

* Asset delivery/GC/515 megapatch

* fix runtime

* Appease integration tests

* More runtime fixes

* Attempting to resolve runtime

* Update spacemanDMM

* icon2html revolution

* icon2html part 2

* fixes

* Attempt to appease linter

* More fixes

* Final fixes (hopefully)

* operator keyword moment

* minor fixes and additions

* undo extra tgui files

* switch to QDEL_IN_STOPPABLE where necessary

* Pain

* GPS runtime

* dropped(null) fix, + chompedit the fixes just incase.

* Fix chat tags

* Update _build_dependencies.sh

* runtime in orebag, duplicate in computer/ship/proc/look, runtime in zoom

* tweak zoom change

* another registersignal override runtime

* 1

* Revert "1"

This reverts commit 43f619ca6c216c2bc41b8f7a346069f99591261b.

* various qdel ref fixes

* newplayer and observer harddels

* disposalholder logging remove, gargoyle hard del + typo

* retouch atom/movable destroy to be TG-like

* potential edge case ref in manualfollow

* extra following potential ref

* global list refs tweak, new_player undo a thing

* /mob/new_player qdel fixes

* undo some things

* revert atoms/movable/destroy

* revert mind and new_player panel changes

* atoms and atom/movable reversions

* bring back datum/mind and panel fixes

* projectile optimisation

* Reverts useless edits, clothing hood runtime, projectile runtime

I tried a lot of things which do not help, and i reverted a lot of it here.

* a few more reversions of useless changes

* Begin getting rid of CHOMPedit comments

* Nuke remaining chompedit comments

* Revert "undo extra tgui files"

This reverts commit f3bdcde8cb.

* fixing oops

* line ending shenanigans

* More GC cleanup

* Optimisations to test/trace projectile, turrets. Tweaks.

Turrets now only trace when they are absolutely sure they want to shoot. disposalholder, effect master and artefact qdel refs changes.

* bad usage of the check_trajectory proc

check_trajectory returns a list of objects hit along it's path to it's target, not a boolean of the target being hittable. a couple places in code assume this, so here they are fixed.

* puts legacy globals into GLOB datum for debug use

* fix upport oopsie

* fix

* Move recursive listening to component

* Minor fixes and cleanup

* undo my temp solution

* tweaks + a missed thing

* recursive_move sanity checks and safety cases

* Catch null initialisation cases + fix borg creation

VV edit spawns the object in nullspace then directly sets it's loc, which means the movement is unregistered. The spawn(0) delay should hopefully mean that setup_parents happens AFTER any unregistered movement.

* circular inventory check, make checks better

* better handling of safety reset cases

* Add logging to safety checks

---------

Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-03-10 09:39:33 +10:00
Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
Kashargul 59d751a9f9 Round value adjustments for react (#15764)
* input adjustments

* .

* .
2024-02-16 14:18:54 +01:00
Selis 157ff3df1f Number modal 2024-02-12 23:33:37 +01:00
Kashargul d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
SatinIsle 51d46b2a51 Energy drinks
Added a set of new Nukie energy drinks, each with their own reagent that causes jitters after 30u.

Also added a Nukie vending machine to find these drinks in!
2023-12-18 16:34:50 +00:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian e064c0e13b soup's on! 2023-09-24 00:12:02 +01:00
SatinIsle d8ba52dd10 Adds teleportation tome and makes potion bases smaller 2023-09-23 00:28:31 +01:00
SatinIsle 1479907300 A few more items consolidated 2023-09-22 22:47:06 +01:00
SatinIsle dd43657b59 Fixed sleep error 2023-09-22 22:09:10 +01:00
SatinIsle 0c39b8b7d8 Fantasy redgate map
Added a new fantasy redgate map that consists of a fantasy town and a large dungeon beneath it.

Added a selection of fantasy props.

Added a variety of "magic" resprites of existing items. These are intended to be tech disguised as magic and have descriptions to hint at it, along with some papers on the map.

Added an alchemy system that creates potions in an alembic out of an ingredient and a base. If the ingredient and base match, an interesting potion is created, if they don't, a poor quality potion is created.

Added a new reagent that polymorphs the drinker into a random creature.

Added a chest version of crates.

Added wooden wall lockers.

Added random spawners for fantasy items, potions, ingredients and bases for mapping.

Added hedge and wooden fences.

Added an old fashioned resprite of the oven.

Added a cooking pot resprite of the microwave.

Added wall torches.

Added barrel version of water tanks, beer tanks, wine tanks, blood tanks and a kettle resprite of a coffee dispenser.

Added a wooden tub bath.

Added 19 new vore mobs: 2 Catslugs, 6 succubi, 1 cryptdrake, 4 vampires 5 peasants and a bat.
2023-09-22 21:44:22 +01:00
Heroman3003 ab7cb2112f Merge pull request #15377 from KillianKirilenko/kk-blood
Blood Reagents Refactor
2023-09-13 07:51:31 +10:00
Killian 8ce5d24277 blood reagents refactor 2023-09-12 20:17:23 +01:00
Heroman3003 c548752ee3 Merge pull request #15374 from Runa-Dacino/zorrencopper
fix(bloodpills): Fixes path
2023-09-11 06:04:21 +10:00
Runa Dacino d4f9832d11 fix(bloodpills): Fixes path 2023-09-10 21:48:40 +02:00
Casey 2288c6d917 Merge pull request #15369 from Runa-Dacino/zorrencopper
Changes blood regen pill instances to contain copper pills due to zorren copper update
2023-09-10 12:57:15 -04:00
Runa Dacino 1b23ff5cdc tweak: Replaces "Iron" pill bottle with blood regen pill bottle
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)

add: Adds Copper pills, Blood regen pill bottles

30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
Heroman3003 94986e7426 Merge pull request #15361 from Runa-Dacino/zorrencopper
Makes Zorren blood actually based on copper: Iron no longer regens their blood, copper is needed
2023-09-10 08:57:38 +10:00
Runa Dacino eca94f7854 tweak(species/chemistry): Makes zorren need copper for blood
Changes iron reagent to no longer regenerate copper for zorren
Changes copper reagent to regenerate blood for zorren
Adds IS_ZORREN reagent_tag define and applies it to species
Updates medical scanner guide to recommend using copper for zorren and skrell
2023-09-07 15:24:27 +02:00
VerySoft 0c89bc1430 Per heroman request 2023-09-03 12:04:51 -04:00
VerySoft 746f0eb30e Decaftea
decafteapowder is cringe, all my friends eat decaftea
2023-09-02 20:00:24 -04:00
Heroman 8316351409 More borg fixes post-testing 2023-08-10 14:16:49 +10:00
Heroman3003 151562ea9b Merge pull request #15060 from Youtubeboy139/sweatmax
Time to get truly SWOL
2023-06-24 04:39:48 +10:00
Youtubeboy139 87681f6c44 Adds in Protein Powder and new Sprites 2023-06-22 16:32:01 -04:00
Selis 271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
Heroman3003 b22b9e6e48 Merge pull request #14936 from ItsSelis/selis-weakrefs
Little Weakref Refactor
2023-06-03 19:21:17 +10:00
ItsSelis 0680645556 Weakref refactor 2023-06-01 20:31:54 +02:00
Heroman 2e099e5552 Buffs harm-injection 2023-06-01 09:47:52 +10:00
Killian 7e9f973516 reagent cleanup 2023-05-01 22:43:57 +01:00
SatinIsle 81a0d80614 Chocolate Allergy
Adds a neutral trait for an allergy to chocolate.
Adds ALLERGEN_CHOCOLATE tag to a number of food/drink reagents, such as coco, chocolate, chocolate milk.

Tested and it seems to work fine with the foods that I tested (chocolate bar, hot chocolate and a few others).
2023-04-19 19:24:38 +01:00
Heroman3003 e86b6cdfa7 Merge pull request #14789 from SatinIsle/Lipozine-Plus
Lipozine Plus
2023-04-16 09:16:21 +10:00
SatinIsle a55ef3a8ce Removed Lipozine Plus
I had accidentally left a copy of Lipozine Plus in from when I changed it to lipozilase. Removed that redundant copy.
2023-04-15 14:03:49 +01:00
SatinIsle 6a51cf9908 Lipostipo now drains nutrition
Lipostipo now drains nutrition at the same rate as lipozilase, simulating turning energy into fat.
2023-04-15 13:59:50 +01:00
Killian db02d0257e Update food_drinks.dm 2023-04-15 11:52:34 +01:00
SatinIsle 9a95dc8a19 Lipostipo and name change
Adds another drug called lipostipo, which increases your weight without adding nutrition. Made using lipozine, nutriment and fluorine. Essentially acts as a reverse of the other drug, adding 3lbs per 1u, same overdose. Max of 500lbs.

Also changes the name of Lipozine Plus to Lipozilase, on account of it still sounding fantasy, it cleaving away fat and being fun to say. Lipostipo comes from the latin for "stuffing full", so stuffing full of fat and is equally fun to say.

Both changes tested locally and work fine.
2023-04-14 10:38:58 +01:00
SatinIsle 0e8eecb407 Lipozine Plus
Adds a drug called Lipozine plus, made with lipozine plus diethylamine. Causes both a nutrition drain and a steady drain of actual weight from the person who has drunk it. Drains weight at a rate of 3 lbs per 1u. Does not check for weight loss rate, as it's pretty much a scene tool used to modify weight directly.
2023-04-14 00:29:53 +01:00
Killian 25eaa6e866 final adjustments and fixes 2023-03-23 14:24:56 +00:00
Killian 1fd16b60b5 phase 3
eh, who needs three traits? also, sanity checking on various boozetypes
2023-03-23 09:08:24 +00:00
Killian 1e103f4395 Update dispenser.dm
remove debug/testing output
2023-03-23 02:25:24 +00:00
Killian 9edbbec997 phase 2 2023-03-23 02:07:14 +00:00
Killian f609ca6008 Merge remote-tracking branch 'upstream/master' into kk-robooze 2023-03-23 01:10:43 +00:00
Killian e77c820fe3 phase 1 2023-03-23 01:06:29 +00:00
Heroman3003 21acee71bf Merge pull request #14551 from VOREStation/upstream-merge-8962
[MIRROR] /tg/ era language pass
2023-03-13 15:23:34 +10:00
Heroman3003 043b99717f Update food_drinks.dm 2023-03-13 15:12:15 +10:00
Heroman3003 6aecbcd4c2 Update reagent_tank.dm 2023-03-13 15:11:06 +10:00
Runa Dacino d9d145bcbc fixes small injectors not working
It worked before making it use both plastic and small injectors. This is what I get for not testing every case and assuming "it worked before"
2023-02-28 21:13:03 +01:00