cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-16 03:43:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,404 Commits 9 Branches 0 Tags
5cefa8d4e325c19407fd949b89d82b0d1799110e
Commit Graph

13124 Commits

Author SHA1 Message Date
Nadyr a9699288a1 Merge pull request #3419 from CHOMPStation2/upstream-merge-11805 
[MIRROR] Simplemob QOL
 2021-12-12 02:54:05 -05:00
Nadyr 3dba9d5740 Merge pull request #3414 from CHOMPStation2/upstream-merge-11798 
[MIRROR] Makes long tails not be taur butts and corrects some hair colors
 2021-12-12 02:39:03 -05:00
Nadyr 959d841128 Merge pull request #3478 from CHOMPStation2/upstream-merge-11772 
[MIRROR] Adds Soft Falling positive trait
 2021-12-11 23:04:24 -05:00
Razgriz 2ab7f180a0 powder that makes you say yes 2021-12-10 19:42:12 -07:00
Casey ea14e85c90 Merge pull request #11953 from Very-Soft/spacewhaletweak 
Space Whale Tweaks
 2021-12-10 21:11:55 +00:00
Razgriz 695e9befa5 powder that makes you say yes 2021-12-10 01:22:53 -07:00
Razgriz 003a0a0c11 powder that makes you say yes 2021-12-10 01:11:57 -07:00
Casey f8cf8f7322 Adds Soft Falling positive trait 2021-12-10 07:21:20 +00:00
Casey 4013b9b1a2 Merge pull request #11805 from Very-Soft/simplemobQOL 
Simplemob QOL
 2021-12-09 23:56:10 +00:00
Casey 8f1116d29d Makes long tails not be taur butts and corrects some hair colors 2021-12-09 23:13:10 +00:00
Casey b2090ce7f2 [MIRROR] Fixes simplemobs with 0 init nutrition runtiming 2021-12-08 22:49:24 +00:00
Nadyr 680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928 
[MIRROR] Offmap Tweaks
 2021-12-05 14:04:20 -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 23384ac5f3 powder that makes you say yes 2021-12-05 13:39:54 -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 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 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 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 12fcd16528 powder that makes you say yes 2021-12-05 13:01:38 -05:00
Nadyr 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -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 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
Nadyr ce08987156 Merge pull request #3245 from CHOMPStation2/upstream-merge-11892 
[MIRROR] Allows Shadekin to use beards
 2021-12-05 10:55:30 -05:00
Nadyr a98f027c97 Merge pull request #3248 from CHOMPStation2/upstream-merge-11889 
[MIRROR] Mice are Nice
 2021-12-05 10:21:55 -05:00
Nadyr b60ece91ea powder that makes you say yes 2021-12-05 10:16:34 -05:00
Nadyr 424e31fa41 powder that makes you say yes 2021-12-05 09:58:18 -05:00
Nadyr ca9b296d14 powder that makes you say yes 2021-12-05 09:49:55 -05:00
Nadyr e31c38a372 powder that makes you say yes 2021-12-05 09:43:20 -05:00
Nadyr 10b2c20ed3 powder that makes you say yes 2021-12-05 09:33:44 -05:00
Nadyr 0598f69d6c powder that makes you say yes 2021-12-05 09:21:34 -05:00
Casey 1cf74ee92a Merge pull request #11882 from Heroman3003/broodmotherfix 
Fixes mobs dying twice on gib
 2021-12-03 07:17:50 +00:00
Casey aee018a27b Mob tweaks 2021-12-03 07:17:35 +00:00
Aronai Sieyes 7fd5500f16 Merge pull request #11938 from Heroman3003/lawfix 
Fixes bad 0th law in rare lost drone case
 2021-12-03 07:16:42 +00:00
Aronai Sieyes 1c228a7d82 Merge pull request #11933 from Heroman3003/botprefs 
Fixes prefs of simple bots allowing vore despite mob itself not allowing it.
 2021-12-03 07:16:34 +00:00
Casey 12cc72e439 Simplifies butchering 2021-12-03 07:16:04 +00:00
Casey af4825cf84 Merge pull request #11917 from Verkister/patch-101 
Fixes simplemobs appearing misleadingly starved
 2021-12-03 07:15:52 +00:00
Casey a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey c7af715672 Merge pull request #11924 from Verkister/patch-104 
Adds more equip slots for monkey hud
 2021-12-03 07:14:49 +00:00
Casey db95a197f1 Merge pull request #11926 from Heroman3003/jackalope 
Adds Jackalope ears and antlers
 2021-12-03 07:14:42 +00:00
Casey 2eb88a6be0 Merge pull request #11937 from ShadeAware/robo-update 
Adds updated "Tall" Cyborg Variants
 2021-12-03 07:14:28 +00:00
Casey fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Casey 9021076104 Swaps Yes and No for give popup 2021-12-03 07:12:39 +00:00
TheGreatKitsune 5ce2094d88 Add some more modules to the medihound 2021-12-02 13:08:16 -06:00