Commit Graph

62 Commits

Author SHA1 Message Date
QuoteFox 42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes"
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
2021-03-17 23:45:38 +00:00
DragonTrance 9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
DragonTrance 26937f3bde modular chemical reactions for hydroponics trays 2021-03-01 09:00:51 -07:00
DragonTrance 8dee9d844a part 1 cause I wanna do other things 2021-02-28 21:35:30 -07:00
DragonTrance fdf8c8ed11 fixes sounds not playing in hydroponics trays 2021-02-25 13:34:13 -07:00
DragonTrance f70a3f8277 botany fixes
Fixes crate datum, hydroponic chemical reactions requiring a seed, indentation, and spades not resetting life timers
2021-02-22 12:21:39 -07:00
DragonTrance d7644adb8c hopefully fix 2021-02-21 21:10:33 -07:00
DragonTrance 3da00de2cd opaque > transparent 2021-02-21 14:22:46 -07:00
DragonTrance 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
Vladin 1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
DragonTrance 58b69503e3 #4 2021-02-11 20:02:40 -07:00
DragonTrance e00a0700b1 #3 2021-02-10 15:35:26 -07:00
DragonTrance ed135323dc #2 2021-02-10 07:18:26 -07:00
DragonTrance 187471f0af #1 2021-02-08 19:15:44 -07:00
QuoteFox b90f60d3a6 Valentines flowers - Admin spawn only
brap cum plant.
2021-02-07 06:09:42 +00:00
DragonTrance 100c896b42 changes lewd plants a bit and fixes other plants 2021-01-27 01:00:09 -07:00
Kabra_men 3e6fb7b5e8 TREES 2021-01-22 20:45:16 -03:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
CygnusB edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Archie 41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03:00
QuoteFox 83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
Archie 87ce4d858c Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
This reverts commit 08c8f744a9.
2021-01-08 17:03:24 -03:00
QuoteFox 08c8f744a9 Revert "Merge pull request #838 from ArchieBeepBoop/test1"
This reverts commit b0dbacee82, reversing
changes made to 813a2ea1c7.
2021-01-08 19:28:18 +00:00
kevinz000 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Putnam3145 0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
QuoteFox ff20e5077b Merge pull request #808 from DragonTrance/catnip-mood-boost
Gives Catnip a Mood Boost to felinids
2021-01-03 05:41:24 +00:00
DragonTrance d43bc54e45 catnip gives felinids a mood boost
TODO: after catnip icon gets merged
2021-01-01 14:08:02 -07:00
DragonTrance bbaecfc295 catnip growth icons 2021-01-01 13:26:10 -07:00
QuoteFox 9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing
Adds the Ability to deconstruct various objects
2020-12-28 19:34:37 +00:00
QuoteFox b3aecde046 Merge pull request #765 from DragonTrance/corpseflower
Corpse Flower
2020-12-26 21:50:41 +00:00
DragonTrance 162ae674c6 constructible showers, loom, sinks & barrels now deconstruct
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench

Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver

Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
2020-12-25 13:22:21 -07:00
Archie b2a1a63bb1 Reagent Fix Pack 1 2020-12-24 14:30:43 -03:00
DragonTrance a807a568a5 i feel like it shouldnt produce miasma while dead 2020-12-23 11:48:53 -07:00
DragonTrance eaaa0c16a6 Corpse Flower
aka brap farm
2020-12-23 11:21:20 -07:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dip 2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Dip a180778587 Botany Fixes 2020-11-07 13:13:46 -03:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000 b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dahlular ec03b6846d Merge pull request #496 from ArchieBeepBoop/soilfix
Digging Soil Patches returns construction amount
2020-09-25 06:08:05 -06:00
Dip 046a8ffd5a Soil returns construction amount 2020-09-25 00:32:40 -03:00
Chemlight 4d1f86a78e WITH THE LEMON
finally throw combustible into xeno arch, giving a decent amount on the table,
2020-09-24 10:58:02 -07:00
Chemlight f24e6abb34 Pink and Milk Seeds to Xenoarch
This little change is simply removing Pink peppers and Milk Melons away from the unstable mutagen list and instead putting it on the xenoarch artifact being a possible item to discover, compared to drowning a watermelon or pepper in chemicals.
2020-09-24 05:41:02 -07:00
Dip 14b98107c4 properly comment something that had been disabled 2020-09-19 13:30:39 -03:00
Tsuchigumo550 c87a022f3b Alters reagent amounts to be more balanced
Alters new plant reagent amounts to be more balanced/more difficult to abuse.
2020-09-10 18:38:44 -04:00