cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,683 Commits 10 Branches 0 Tags
master
Commit Graph
730 Commits
Author SHA1 Message Date
RazgrizandGitHub 81da61dd70 Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2 
Fixes some small transit bug.
 2022-10-15 23:13:16 -07:00
BlackMajor 24c64ae0a6 Fixes 2022-10-16 11:33:57 +13:00
BlackMajor df17de237a Whoops 2022-10-16 10:16:47 +13:00
CaseyandCHOMPStation2 f49362b8e1 Merge pull request #13851 from Heroman3003/emote-fixes 
Fixes some one person having a specific emote giving it to everyone
 2022-10-10 03:00:04 +00:00
Bib Bob 3365742b17 powder that makes you say yes 2022-10-08 22:41:28 -05:00
BlackMajorandGitHub f8162b416d Update mob.dm 2022-10-08 14:31:09 +13:00
BlackMajorandGitHub d37190a969 Update mob.dm 2022-10-08 14:27:58 +13:00
TheGreatKitsune 1d8bc1b862 Add vore sprite coloring. 2022-10-04 18:07:56 -05:00
MeepleMuncherandGitHub 12fe3383e0 add foxtaur code 2022-09-27 15:51:40 +03:00
Bib Bob 4ac8de1f7e tags: disposal (of bodies) 
dead VR bodies auto delete after 5 minutes, no more lag!
 2022-09-23 10:50:49 -05:00
BlackMajor bb6c77dd57 Total Reassembly 2022-09-19 14:40:29 +12:00
BlackMajor 0af27b48f6 Prot EMP fixes 2022-09-16 12:44:16 +12:00
BlackMajorandGitHub c4455d4bd0 Merge branch 'master' into protean-rework 2022-09-12 23:40:01 +12:00
BlackMajor 19574a9950 Last of the prot snowflake modules 2022-09-12 22:40:52 +12:00
NadyrandGitHub a56f4f4f97 Merge pull request #4850 from UniquaSa/stru 
More supply packs and small teppi tweak
 2022-09-10 21:36:06 -04:00
SarmentiCampbell 9bddec8134 crate 
removed otie's crate
ay
 2022-09-06 18:23:19 +02:00
VerkisterandGitHub 223c392f9e Update update_icons.dm 2022-09-02 16:41:57 +03:00
VerkisterandGitHub f69597cd92 Fixes incorrect duplicate layer defines 
And comments them out because they have no reason to be here in the first place as they already exist in the main file with their correct numbers and all.
 2022-09-02 16:29:08 +03:00
BlackMajor 65e2cdd259 Some fixes 2022-08-30 22:24:10 +12:00
BlackMajor 72f1ddc6fa protean rig armor 2022-08-26 16:11:06 +12:00
BlackMajor 43888a6718 starting prot rig modules 2022-08-25 21:57:08 +12:00
BlackMajor a26503b1a5 bug fix 2022-08-23 01:33:41 +12:00
BlackMajor 44edd5178b Protean Tankiness nerf 2022-08-23 00:09:10 +12:00
Mysterijojo 014ea7a0c4 ... forgot the tails. 
Forgot to split the tails.
 2022-08-21 12:04:51 -07:00
Mysterijojo 0c209034fe Separated new markings into /modular_chomp 
Hopefully reverted most the changes to /code, and ported them to /modular_chomp.
 2022-08-21 12:01:15 -07:00
BlackMajor e19cc2ebff some fixes 2022-08-20 19:35:05 +12:00
BlackMajorandGitHub 7a7a006caf Merge branch 'master' into protean-rework 2022-08-20 09:53:04 +12:00
BlackMajor afe6d88de2 Back to work. Protean rig interface. 2022-08-20 09:48:09 +12:00
Mysterijojo e9ed37adb5 Sect drone bodytype marking 
Introduced sect drone bodytype markings, with appropriate wings and tail.
 2022-08-18 06:56:47 -07:00
TheGreatKitsune 5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
TheGreatKitsune 6b542e59d2 Add reforming 2022-08-04 15:04:34 -05:00
Victor ZisthusandGitHub f5d01823ef a 2022-07-25 18:58:51 -04:00
Victor ZisthusandGitHub 2c8186cccc removed an oopsie 2022-07-25 18:55:49 -04:00
Victor Zisthus ffd72fd200 Nerfing Vore 
I've come to nerf vore in the vorecode, and only the headmins and maintainers can stop me!
 2022-07-25 18:49:00 -04:00
BlackMajor 1affb3a089 Some preferred changes 2022-07-20 22:34:04 +12:00
TheGreatKitsune 6c8bc4f8f4 Fix resist animation, hide a currently unused option 2022-07-09 14:30:19 -05:00
TheGreatKitsune 79e3f9d0f5 Fixing taur vore sprites 2022-07-09 11:26:02 -05:00
TheGreatKitsune 30fa381175 Merge master into vore-sprites branch 2022-07-07 09:34:54 -05:00
NadyrandGitHub 4e1e725526 Fixing dreamchecker 2022-06-26 04:25:18 -04:00
NadyrandGitHub a5970e7ab7 Fixing dreamchecker 2022-06-26 04:23:51 -04:00
NadyrandGitHub 99945c8f0d Fixing dreamchecker 2022-06-26 04:23:18 -04:00
NadyrandGitHub 93830975fc fixing dreamchecker 2022-06-26 04:20:20 -04:00
BlackMajorandGitHub d74d15fa72 Merge branch 'master' into protean-rework 2022-06-25 09:45:23 +12:00
NadyrandGitHub a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
TheGreatKitsune 30c79dc929 Move stuff to modular_chomp, and add struggle animation 2022-06-21 10:24:38 -05:00
CaseyandCHOMPStation2 b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
CaseyandCHOMPStation2 928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
TheGreatKitsune 742968724e Adds pick size and pick color verbs 2022-06-04 14:28:07 -05:00
TheGreatKitsune 63c9549ab7 prep for resist animation, and updated sprites 2022-05-16 18:01:40 -05:00
BlackMajorandGitHub 5ece102a02 Merge branch 'master' into protean-rework 2022-05-12 14:24:51 +12:00