cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-03 21:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,771 Commits 10 Branches 0 Tags
e8a55485a14ea567b89490a9d9d3f3a61ba97840
Commit Graph

579 Commits

Author SHA1 Message Date
Nadyr
9122ceff75 Merge pull request #3484 from CHOMPStation2/upstream-merge-11997 
[MIRROR] Fixes some issues with icons in hydroponics
 2021-12-12 06:43:30 -05:00
Nadyr
b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842 
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
 2021-12-12 05:39:43 -05:00
Nadyr
59602e40bd powder that makes you say yes 2021-12-12 05:29:58 -05:00
Casey
ab7e21e51c Merge pull request #11997 from Heroman3003/hydro-icon-fixes 
Fixes some issues with icons in hydroponics
 2021-12-11 03:45:13 +00:00
Casey
3b90133c20 SpaceVines - Now with 100% More Landmark Moments 2021-12-10 04:36:44 +00:00
Casey
9c7d030128 Somatoray Modularity 2021-12-10 04:33:32 +00:00
Rykka
e622a208c4 Finishes the last of the error fixes 
Fixes Integer precision loss in autotransfer.dm and types_ch.dm
Fixes operator overload in solargrub.dm
Fixes field access requires static type errors in vorepanel_vr.dm, kasscbuttons_ch.dm, and seed.dm
Fixes ambigious && in metroid_infestation.dm
 2021-09-17 00:07:10 -07:00
Nadyr
6813c8f185 powder that makes you say yes 2021-08-27 20:11:38 -04:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Novacat
96a6740ba2 Merge pull request #11480 from VOREStation/upstream-merge-8225 
[MIRROR] Seed Contraband Changes
 2021-08-24 23:57:31 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
12030d27d4 Merge pull request #11030 from MarinaGryphon/bugfix/plantsprite 
Fixes #10722
 2021-07-12 05:59:12 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
cb5671c638 Make req_[one_]access lazy 2021-05-31 17:30:12 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
8019cd3421 Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445 
[MIRROR] [MIRROR] Department and Round Goals
 2021-03-30 03:46:36 -04:00
Novacat
877dfbc049 Merge pull request #10023 from VOREStation/upstream-merge-8011 
[MIRROR] Ported updated decls repository from Neb.
 2021-03-26 13:46:39 +00:00
Razgriz
401784f3e8 Merge branch 'master' into upstream-merge-9445 2021-03-10 17:59:32 -07:00
Nadyr
bc944aacf1 Merge pull request #1376 from CHOMPStationBot/upstream-merge-9764 
[MIRROR] [MIRROR] Couple of small fixes.
 2021-02-28 07:16:38 -05:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
3e965d9416 Merge pull request #9792 from Heroman3003/wormspice 
Adds wurmwoad to the seed dispensers.
 2021-02-24 21:34:56 +00:00
Novacat
e27799eba2 Merge pull request #9445 from VOREStation/upstream-merge-7369 
[MIRROR] Department and Round Goals
 2021-02-21 22:15:39 +00:00
Novacat
2082a52b2a Merge pull request #9764 from VOREStation/upstream-merge-7899 
[MIRROR] Couple of small fixes.
 2021-02-20 07:31:55 +00:00
Chompstation Bot
c11124cb58 [MIRROR] Absurd Amount of Food Fixes 2021-02-08 04:59:38 +00:00
Novacat
cd1ad32cb2 Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-08 03:38:26 +00:00
Novacat
f92c8d9fc4 Merge pull request #9362 from ShadowLarkens/patch-1 
Prevent cyclic neighbor references in spreading plants
 2020-11-25 21:50:11 +00:00
Cadyn
4183f92f2a Building TGUI 2020-11-15 01:58:16 -08:00
Darlantan
c9d60805b7 Nerfs space vine pitcher plants 
Also makes pitchers drop fruit on death, if they have a fruit.
 2020-10-25 23:43:20 -04:00
Darlantan
9ffbd1138f Pitcher plants 
Adds the pitcher plant mob, obtainable from hydroponics which produces a reagent which doubles the speed of plant growth. Makes pitchers spawn from vines. Includes all the extra tweaks needed to make this stuff work.
 2020-10-22 08:08:19 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
f8bd128836 Remove phorochem code 2020-09-26 15:06:20 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
961848876a Plant analyzer fix 2020-09-06 15:17:02 -07:00
Khloross
7359bbe727 implement biochemical manipulator for xenoflora with UI 2020-09-06 02:25:20 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
boydca001
6aca8877d4 add handling for inconsistent chem definitions 2020-07-31 02:10:01 -04:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00