cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,276 Commits 6 Branches 0 Tags
92d87ee3c614123cb15c3543c371f75810df8be1
Commit Graph

49 Commits

Author SHA1 Message Date
Nadyr
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
Verkister
223c392f9e Update update_icons.dm 2022-09-02 16:41:57 +03:00
Verkister
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
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
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
Victor Zisthus
f5d01823ef a 2022-07-25 18:58:51 -04:00
Victor Zisthus
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
Nadyr
4e1e725526 Fixing dreamchecker 2022-06-26 04:25:18 -04:00
Nadyr
a5970e7ab7 Fixing dreamchecker 2022-06-26 04:23:51 -04:00
Nadyr
99945c8f0d Fixing dreamchecker 2022-06-26 04:23:18 -04:00
Nadyr
93830975fc fixing dreamchecker 2022-06-26 04:20:20 -04:00
Nadyr
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
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
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
Razgriz
2e5d144afa Merge branch 'master' into benos 2022-05-10 22:05:55 -07:00
Rae
761c9eab33 emote list adder, sprite oop, spin delay, 2022-05-09 18:38:27 +02:00
TheGreatKitsune
92d388fcb7 move to modular folder 2022-05-09 10:33:20 -05:00
Rae
9d66079aff reorganise, speeen, sentinel 2022-05-09 17:29:26 +02:00
Rae
3a61e8fac6 initial commit 2022-05-09 14:58:55 +02:00
BlackMajor
6dc76ad03e More fixes etc 2022-04-25 23:27:24 +12:00
BlackMajor
8a4fccda00 small prot rig fix 2022-04-25 13:18:13 +12:00
BlackMajor
f5693e9762 Grinding out the goals, and bugs 2022-04-24 02:44:47 +12:00
BlackMajor
15a01777d3 Even more fixes 2022-04-23 20:21:01 +12:00
BlackMajor
b3438e670a snowflake attack proc because im lazy 2022-04-23 01:14:07 +12:00
BlackMajor
ebe8947bff Stop picking yourself up 2022-04-22 12:26:51 +12:00
BlackMajor
72008618bf quick heal fix before i go to work 2022-04-22 12:23:18 +12:00
BlackMajor
9b98230f95 FUCK YOU 2022-04-22 00:02:19 +12:00
BlackMajor
6de234b6de why didnt shock protection work 2022-04-21 23:36:09 +12:00
BlackMajor
25fcc0b510 whoops that's the wrong health calc 2022-04-21 19:55:03 +12:00
BlackMajor
23e57c7f7e forgot the debug messages 2022-04-21 17:16:00 +12:00
BlackMajor
1e7abef9ce Good code going for test merge 2022-04-21 17:14:12 +12:00
BlackMajor
15ec60f86f Integration Tests, my beloved 2022-04-21 01:54:56 +12:00
BlackMajor
678584eb2f ironing out icon conflicts 2022-04-21 01:40:12 +12:00
BlackMajor
f2a8beec0f linter moment 2022-04-21 01:21:41 +12:00
BlackMajor
c8909c037c Resident man embraces insanity, starts porting _ch files 2022-04-21 01:17:24 +12:00
BlackMajor
119b70776f Progress 2022-04-20 22:49:11 +12:00
BlackMajor
beb962eac3 AE 2022-04-20 16:30:44 +12:00
BlackMajor
c8b8ff2e0f move associated code to modular folder 2022-04-17 19:31:21 +12:00