cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 8 Branches 0 Tags
c2441330b67a505284c91ae236e0e00b425724df
Commit Graph

67259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey
c2441330b6 Adds general-purpose cooking oil, replaces usages of corn oil 2021-12-10 00:20:40 +00:00
CHOMPStation2
e6f330182b Update chat_commands_zz_ch.dm 2021-12-06 15:56:27 -07:00
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928 
[MIRROR] Offmap Tweaks
 2021-12-05 14:04:20 -05:00
Nadyr
7a1011bb57 Merge pull request #3209 from CHOMPStation2/upstream-merge-11939 
[MIRROR] Fixes certain aspects of NIFSofts not applying properly on resleeve
 2021-12-05 13:52:17 -05:00
Nadyr
7a72866c49 powder that makes you say yes 2021-12-05 13:51:40 -05:00
Nadyr
46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr
feeb9e1254 powder that makes you say yes 2021-12-05 13:45:40 -05:00
Nadyr
fb378c4668 Merge pull request #3205 from Verkister/patch-65 
Fixes dirt vulnerability
 2021-12-05 13:41:02 -05:00
Nadyr
bbaa6d52e2 Merge pull request #3207 from CHOMPStation2/upstream-merge-11922 
[MIRROR] Swaps Yes and No for give popup
 2021-12-05 13:40:24 -05:00
Nadyr
966e0cba44 Merge pull request #3208 from CHOMPStation2/upstream-merge-11941 
[MIRROR] v2 science outpost rework
 2021-12-05 13:40:12 -05:00
Nadyr
23384ac5f3 powder that makes you say yes 2021-12-05 13:39:54 -05:00
Nadyr
e73bb63e56 powder that makes you say yes 2021-12-05 13:37:23 -05:00
Nadyr
f34728bca2 Merge pull request #3212 from CHOMPStation2/upstream-merge-11937 
[MIRROR] Adds updated "Tall" Cyborg Variants
 2021-12-05 13:29:32 -05:00
Nadyr
6af96297db Merge pull request #3213 from CHOMPStation2/upstream-merge-11946 
[MIRROR] Fixes vertical noise spread penetrating floors
 2021-12-05 13:29:11 -05:00
Nadyr
e895ee197c Merge pull request #3214 from CHOMPStation2/upstream-merge-11926 
[MIRROR] Adds Jackalope ears and antlers
 2021-12-05 13:28:58 -05:00
Nadyr
b2e74aefae Merge pull request #3215 from CHOMPStation2/upstream-merge-11924 
[MIRROR] Adds more equip slots for monkey hud
 2021-12-05 13:28:48 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921 
[MIRROR] Snakes are Sweet
 2021-12-05 13:28:39 -05:00
Nadyr
995e2404c6 powder that makes you say yes 2021-12-05 13:28:16 -05:00
Nadyr
872fc25da5 powder that makes you say yes 2021-12-05 13:27:41 -05:00
Nadyr
64ee18f0d7 powder that makes you say yes 2021-12-05 13:24:17 -05:00
Nadyr
1db640b9df powder that makes you say yes 2021-12-05 13:23:02 -05:00
Nadyr
91f3a77243 powder that makes you say yes 2021-12-05 13:14:43 -05:00
Nadyr
dce81c41e8 powder that makes you say yes 2021-12-05 13:11:46 -05:00
Nadyr
ad19f385ef Merge pull request #3216 from CHOMPStation2/upstream-merge-11923 
[MIRROR] Makes suspension field generator function in areas without power
 2021-12-05 13:10:21 -05:00
Nadyr
5b4b80fcd4 Merge pull request #3218 from CHOMPStation2/upstream-merge-11920 
[MIRROR] Probably fixes xenowear loadout reset bug
 2021-12-05 13:10:10 -05:00
Nadyr
bccbb786a7 Merge pull request #3220 from CHOMPStation2/upstream-merge-11917 
[MIRROR] Fixes simplemobs appearing misleadingly starved
 2021-12-05 13:09:59 -05:00
Nadyr
4ec0f7afb5 Merge pull request #3219 from CHOMPStation2/upstream-merge-11918 
[MIRROR] More appropriate stack digestion
 2021-12-05 13:09:31 -05:00
Nadyr
8e779b4d64 Merge pull request #3221 from CHOMPStation2/upstream-merge-11912 
[MIRROR] Simplifies butchering
 2021-12-05 13:09:16 -05:00
Nadyr
1e8a2d5ef0 Merge pull request #3206 from TheGreatKitsune/medihound-extra-modules 
Add some missing modules to the medihound
 2021-12-05 13:08:58 -05:00
Nadyr
f9bf5dffd5 Merge pull request #3204 from Verkister/patch-64 
Probably fixes a little autotransfer bug
 2021-12-05 13:08:31 -05:00
Nadyr
be60f7e039 powder that makes you say yes 2021-12-05 13:07:11 -05:00
Nadyr
9b4f0cde71 powder that makes you say yes 2021-12-05 13:03:47 -05:00
Nadyr
12fcd16528 powder that makes you say yes 2021-12-05 13:01:38 -05:00
Darlantan
ab99e251fb powder that makes you say yes 2021-12-05 12:58:19 -05:00
Nadyr
4efe4d49ef powder that makes you say yes 2021-12-05 12:53:32 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
72481c548e powder that makes you say yes 2021-12-05 12:43:57 -05:00
Nadyr
5a4db1f1ac powder that makes you say yes 2021-12-05 12:42:03 -05:00
Nadyr
7399798406 Merge pull request #3222 from CHOMPStation2/upstream-merge-11931 
[MIRROR] Adds Amaryll's claws fluff item
 2021-12-05 12:40:51 -05:00
Nadyr
ea10e52abb Merge pull request #3224 from CHOMPStation2/upstream-merge-11933 
[MIRROR] Fixes prefs of simple bots allowing vore despite mob itself not allowing it.
 2021-12-05 12:39:52 -05:00
Nadyr
e101e1edc4 Merge pull request #3225 from CHOMPStation2/upstream-merge-11938 
[MIRROR] Fixes bad 0th law in rare lost drone case
 2021-12-05 12:39:32 -05:00
Nadyr
2f0a060a35 powder that makes you say yes 2021-12-05 12:36:47 -05:00
Nadyr
0fd8caed89 powder that makes you say yes 2021-12-05 12:33:31 -05:00
Nadyr
7833b7523e Merge pull request #3226 from CHOMPStation2/upstream-merge-11942 
[MIRROR] Fixes a vchat runtime
 2021-12-05 12:32:13 -05:00
Nadyr
368efb1522 Merge pull request #3227 from CHOMPStation2/upstream-merge-11913 
[MIRROR] Active Edge Hunt Part 5 - Revelation
 2021-12-05 12:32:01 -05:00
Nadyr
2296fd52a3 Merge pull request #3228 from CHOMPStation2/upstream-merge-11919 
[MIRROR] Fixes missing ladder assembly icon
 2021-12-05 12:31:49 -05:00
Nadyr
4646fa1fed powder that makes you say yes 2021-12-05 12:31:24 -05:00
Nadyr
7244680a29 powder that makes you say yes 2021-12-05 12:30:36 -05:00
Nadyr
a55034a2a0 Merge pull request #3229 from CHOMPStation2/upstream-merge-11911 
[MIRROR] Mob tweaks
 2021-12-05 12:26:07 -05:00
Nadyr
b5cb7fc2fb Merge pull request #3230 from CHOMPStation2/upstream-merge-11882 
[MIRROR] Fixes mobs dying twice on gib
 2021-12-05 12:24:05 -05:00