cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,668 Commits 5 Branches 0 Tags
c0ee2c30d3dce83463e58be78327d6070985e22c
Commit Graph

630 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
2d0719a4d4 [MIRROR] some dropped sanity (#9856) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-12 17:34:37 +01:00
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBot
0180cc74c5 [MIRROR] usr to user up to player effects (#9552) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-01 18:31:19 +01:00
CHOMPStation2StaffMirrorBot
a7e4ef7dad [MIRROR] Some ZAS tweaks and minor optimizations (#9544) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-01 18:31:06 +01:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2
4bb30c42f0 [MIRROR] Restores the sounds for all the items (#9226) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-13 22:10:18 +02:00
Kashargul
6b63352129 up ports bluespace disruptor (#9128) 2024-10-04 13:00:23 -04:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
31407a0be3 [MIRROR] First part of a span rework (#9120) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-02 16:25:48 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
Guti
f9b5161ab5 Memory leak fix (#8647) 2024-07-15 22:52:32 +02:00
CHOMPStation2
b7c47a50e7 [MIRROR] Some tgui stuff, lavender again... (#8544) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-18 01:04:48 +02:00
CHOMPStation2
15863e00f8 [MIRROR] Undefines local defines and moves global to __define (#8502) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-09 18:26:41 +02:00
CHOMPStation2
d34fdbdc04 [MIRROR] fix lavender seed icon (#8472) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-06-01 17:46:42 +02:00
Cadyn
a5570c671c fuck everything (I tried to fix GC stuff again) (#8327) 2024-04-29 16:08:39 +02:00
CHOMPStation2
234aed941f [MIRROR] fix some runtimes and an overlay overflow (#8210) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-11 07:47:45 +02:00
Cadyn
d278ce4fb0 TG overlay subsystem (#8147) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-04-06 09:58:45 +02:00
Raeschen
5de38fdc17 Remove a to_world in seeds (#7858) 2024-03-01 23:25:02 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Guti
a2902e1064 Glacial Lettuce (#7502) 2024-01-04 17:19:01 -05:00
Guti
f32a21f36b Phase fixes (#7484) 2023-12-31 20:13:13 -05:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
CHOMPStation2
7e7b7200ff [MIRROR] Fruit spawners (#6972) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-12 23:21:30 +02:00
Nadyr
c036c32091 Merge branch 'master' into upstream-merge-14957 2023-06-09 22:27:00 -04:00
Heroman3003
1ccc27a6d3 Fixes #14956 2023-06-03 19:14:06 +00:00
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003
c1ac01b62c Merge pull request #14759 from KillianKirilenko/kk-canteven 
Botany/Hydroponics minifix
 2023-04-06 07:32:10 +00:00
Heroman3003
8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Heroman3003
e9c2487299 Merge pull request #14290 from VOREStation/upstream-merge-8851 
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
 2023-01-04 02:56:23 +00:00
Casey
f70dc36da1 Merge pull request #14051 from Heroman3003/hedgetrim 
Makes hedge trimmers instakill vines
 2022-11-13 20:44:27 +00:00
Heroman3003
a921153eca Merge pull request #13995 from Heroman3003/peppercorns 
Adds peppercorn berry plant
 2022-10-29 06:20:26 +00:00
Nadyr
39dcc037ba powder that makes you say yes 2022-10-11 20:31:01 -04:00
Casey
14d698a2e1 [MIRROR] Spkrtn/fix/8703 8733 [ABLE TO BE MERGED] 2022-10-10 03:06:13 +00:00
Verkister
0822ccfc55 Earlyport harvest color fix 
Fixes harvested produce getting the produce color (meant for the produce part of the icon overlay and not the leaf part, which uses its own color) applied on top of both already colored overlays for a second time, most visible on mushrooms, which have ended up with hypersaturated caps and incorrect underside colors.
 2022-10-05 14:05:53 +03:00
xnqm8h
6748b9fbcf Starts vine processing from tray on creation 2022-08-18 22:00:19 -04:00
xnqm8h
06f95c94d3 Commenting out fallingapples. 
Commenting out fallingapples.
 2022-08-06 21:45:32 -04:00
xnqm8h
00666fcad0 Adding chompedit comments to non chomp files. 
Adding chompedit comments to non chomp files.
 2022-08-06 20:03:59 -04:00
xnqm8h
3dbb49378f Fixes mutation chains for chomp seeds and some reaction formulas 🪴💊 
Fixes missing mutation chains for most of the plant types in seed_datums_ch along with fixing some typos in some chemical reactions. Lastly added a simple description for Bullvalene since it had a placeholder one.
 2022-08-05 16:53:02 -04:00
Poojawa
575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat 
Lettuce Eat
 2022-04-17 17:55:59 +00:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey
d07469a44c Carpet Craftin' 2022-02-25 23:37:02 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Casey
1ffb955516 Misc Tweaks 2022-02-17 13:02:10 +00:00