cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,220 Commits 12 Branches 0 Tags
63009681faa6d328e8d7edfef15a64ed63473bd7
Commit Graph

76 Commits

Author SHA1 Message Date
Pinta
63009681fa it compiles, that's better than it not compiling, right? 2024-03-24 06:36:59 -04:00
Aeris Bennet
7c64f8b301 Did as much as I can with adding more GATO branding. 2024-02-09 02:29:29 +00:00
KabKebab
92060cc123 weight chems are now more potent, weight loss chem is now safer 2022-05-07 20:42:47 +02:00
Archie
ccb77e1c46 Tildes 2021-07-15 18:42:59 -03:00
Archie
020ba1d77c Eh 2021-07-15 18:34:43 -03:00
kevinz000
865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273 
ports anti-magic component code updates (holymelon sold separately).
 2021-07-15 17:43:18 -03:00
Archie
8d33579e86 Removes holy melon anti-magic 2021-07-15 17:25:54 -03:00
kevinz000
ec4430bc50 Demodularization, fixes missing icons 2021-06-14 03:57:25 -03:00
Archie
2d6d24f2aa bananae 2021-06-14 03:44:16 -03:00
Archie
90a7b95f8c why not? Why shouldn't I randomly add a deep rock reference 2021-05-16 21:05:20 -03:00
DragonTrance
42f4fe1721 i probably should resolve conflicts with desktop 2021-04-20 01:18:01 -07:00
DragonTrance
20e2c2fcea Merge branch 'master' into various-fixes 2021-04-20 00:56:44 -07:00
DragonTrance
b4039d7cbb various fixes v2 
1 - Loadout items no longer duplicate backpack items, and all items get stored into backpacks properly
2 - Fixed a runtime with captain's job on roundstart. They will now be announced when they join at the start of the shift.
3 - Fixed filter runtime when transferring ckeys
4 - Economy SS no longer fires, so it will no longer clutter runtime logs
5 - Fixed laughing peas not being able to be taken out of seed extractors by lazily renaming them
 2021-04-20 00:52:33 -07:00
DragonTrance
11a41d1bc1 Revert "fixes various bugs and runtimes" 
This reverts commit 9860480e91.
 2021-03-18 11:19:37 -07:00
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