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
65,187 Commits 5 Branches 0 Tags
82312e29c59e9576ab3670db8145e496999ca2f6
Commit Graph

2376 Commits

Author SHA1 Message Date
Dan-Neposh
82312e29c5 adds narsour and cogchamp themselves 2021-08-19 22:07:20 -04:00
Nadyr
913a84eb5c Merge branch 'master' into upstream-merge-10976 2021-07-10 01:22:38 -04:00
Nadyr
7cd8d9c093 powder that makes you say yes 2021-07-10 01:18:41 -04:00
Nadyr
e48d0aa61c Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971 
[MIRROR] 4 random runtime fixes
 2021-07-10 00:00:30 -04:00
Nadyr
685a01907f powder that makes you say yes 2021-07-09 23:46:36 -04:00
Chompstation Bot
e8c29d4d74 Fixes blood being not injectable in any container of /food subtype 2021-07-08 06:48:44 +00:00
Chompstation Bot
b965d1546c 4 random runtime fixes 2021-07-08 04:54:06 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Razgriz
1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802 
[MIRROR] Port several foods and food sprites
 2021-07-03 14:49:34 -07:00
Aronai Sieyes
67e370b0cf Merge pull request #10800 from VOREStation/Icons/chemistry 
Swap chemmaster, port beaker sprites
 2021-07-03 20:31:14 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Verkister
571796baca Fixes lewdchem emote stuff 2021-07-02 15:26:50 +03:00
Nadyr
f741c9af94 powder that makes you say yes 2021-07-01 20:26:14 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
8aceda111e Merge pull request #2295 from CHOMPStation2/Razgriz1032-patch-5 
Change Osteodaxon total volume required from 5 to 1
 2021-06-29 19:46:18 -04:00
Novacat
2f6381ce13 Merge pull request #10776 from VOREStation/upstream-merge-8159 
[MIRROR] Typo Fixy
 2021-06-28 10:40:59 +00:00
Razgriz
e675401f4a Change Osteodaxon total volume required from 5 to 1 
Change Osteodaxon total volume required to heal from 5 to 1
 2021-06-26 15:15:24 -07:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Nadyr
154a665dbf Merge branch 'CHOMPStation2:master' into upstream-merge-10737 2021-06-25 20:59:55 -04:00
Razgriz
422c5e958f Update medicine.dm 2021-06-25 00:28:41 -07:00
Chompstation Bot
144af78224 TGUI fixes post update 2021-06-24 02:18:07 +00:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
d8929f3f8a Update reagent_tank.dm 2021-06-17 23:02:54 -07:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
1cb49c834b Merge pull request #10653 from Heroman3003/unmoo 
Refluffs Pink Moo into Pink Russian
 2021-06-15 13:29:11 +00:00
Chompstation Bot
a0e3679020 Adds gender TF chemicals + Spontaneous TF pref 2021-05-30 23:00:43 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Novacat
d5a6cb16a3 Merge pull request #10332 from VOREStation/Arokha/emoflip 
Touch up emote port
 2021-05-15 15:13:23 +00:00
Nadyr
8061357d98 Update _reagents.dm 2021-05-11 22:55:03 -04:00
Nadyr
6e1e68e311 Update holder.dm 2021-05-11 22:50:58 -04:00
Nadyr
4f59ea141c Delete Chemistry-Reagents.dm 2021-05-11 22:46:26 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Nadyr
0a3f0b7a01 Update _reagents.dm 2021-05-09 04:19:22 -04:00
Nadyr
47b8ea028b Update instant_ch.dm 2021-05-09 03:28:59 -04:00
Nadyr
86d7837042 Create food_ch.dm 2021-05-09 03:28:41 -04:00
Nadyr
3a70d7ea8b Delete kelshark.dm 2021-05-09 02:57:50 -04:00
Nadyr
a66e7b0f75 Delete Chemistry-Recipes_ch.dm 2021-05-09 02:57:40 -04:00
Nadyr
2799517ed6 Create instant_ch.dm 2021-05-09 02:57:04 -04:00
Nadyr
264a623a20 Update vore_ch.dm 2021-05-09 02:51:53 -04:00
Nadyr
4ea8360551 Update vore_ch.dm 2021-05-09 02:51:14 -04:00
Nadyr
902d3e5549 Delete Chemistry-Recipes_yw.dm 2021-05-09 02:44:57 -04:00
Nadyr
9dc767d9fb Create drinks_ch.dm 2021-05-09 02:43:08 -04:00
Nadyr
e411384a30 Delete cartridge_presets_ch.dm 2021-05-09 02:24:43 -04:00
Nadyr
0604018103 Create cartridge_presets_ch.dm 2021-05-09 02:22:40 -04:00
Nadyr
5ab1dad716 Delete reagent_dispenser_ch.dm 2021-05-09 02:19:39 -04:00
Nadyr
b7187e7cb9 Create reagent_tank_ch.dm 2021-05-09 02:19:22 -04:00
Nadyr
216e6cdbba Delete Chemistry-Reagents_ch.dm 2021-05-09 02:11:38 -04:00
Nadyr
593aecb049 Update other_ch.dm 2021-05-09 02:09:30 -04:00