cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,818 Commits 10 Branches 0 Tags
8ab9a847d041d811b0699acd0585a213aa651b58
Commit Graph

73818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heroman3003
8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Nadyr
f09fd02e6e Merge pull request #5894 from CHOMPStation2/upstream-merge-14641 
[MIRROR] Fixes some admin perms not being properly checked
 2023-03-09 22:23:21 -05:00
Nadyr
0cb04f7a19 Merge pull request #5890 from CHOMPStation2/upstream-merge-14519 
[MIRROR] [MIRROR] allows animations to be toggled in preferences
 2023-03-09 22:18:05 -05:00
Nadyr
deb7221578 Merge pull request #5889 from CHOMPStation2/upstream-merge-14630 
[MIRROR] NIF damage minitweak
 2023-03-09 22:17:24 -05:00
Nadyr
2eb94dcbaf Merge pull request #5887 from CHOMPStation2/upstream-merge-14607 
[MIRROR] [MIRROR] Fixes an oversight with default emote retrieval.
 2023-03-09 22:13:51 -05:00
Nadyr
9968742281 Merge pull request #5886 from CHOMPStation2/upstream-merge-14610 
[MIRROR] [MIRROR] Projectiles properly set starting var.
 2023-03-09 22:09:14 -05:00
Nadyr
05541568da Merge pull request #5885 from CHOMPStation2/upstream-merge-14585 
[MIRROR] Fixes window icons on luxury yacht, nerfs royal spider eggs
 2023-03-09 22:08:30 -05:00
Nadyr
f9027ed838 powder that makes you say yes 2023-03-09 21:28:44 -05:00
Nadyr
4d61bf0f16 Merge pull request #5884 from CHOMPStation2/upstream-merge-14584 
[MIRROR] stops robots from getting spammed on different z levels from cellcharge anomaly
 2023-03-09 21:25:11 -05:00
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -05:00
Nadyr
a5b1fc988f Merge pull request #5882 from tacoguy7765093/tide 
Gives tool storage, aux tool storage, and outpost building materials.
 2023-03-09 21:21:29 -05:00
Nadyr
3fa558ba82 Merge pull request #5879 from CHOMPStation2/upstream-merge-14628 
[MIRROR] Adds a Single Side Horn and Blade-Like Tail markings
 2023-03-09 21:20:34 -05:00
Nadyr
3b73100ae8 Merge pull request #5878 from CHOMPStation2/upstream-merge-14629 
[MIRROR] Adds 'vore' objective
 2023-03-09 21:19:43 -05:00
Nadyr
a3576a6f06 Merge pull request #5876 from CHOMPStation2/upstream-merge-14620 
[MIRROR] Start With Backup Implant setting
 2023-03-09 21:19:11 -05:00
Nadyr
2eb9bc33f3 powder that makes you say yes 2023-03-09 21:00:47 -05:00
Nadyr
98feff2977 powder that makes you say yes 2023-03-09 20:59:23 -05:00
Nadyr
b5bfb71f76 Merge pull request #5877 from CHOMPStation2/upstream-merge-14619 
[MIRROR] Updates player tips subsystemwith a new tip about maint preds.
 2023-03-09 20:58:09 -05:00
Nadyr
563e79da67 powder that makes you say yes 2023-03-09 20:57:04 -05:00
Nadyr
3cd859e7e9 Merge pull request #5875 from CHOMPStation2/upstream-merge-14591 
[MIRROR] Adds new POI to RP, creates scug spawner object
 2023-03-09 20:55:20 -05:00
Nadyr
809f95e4b5 Merge pull request #5874 from CHOMPStation2/upstream-merge-14617 
[MIRROR] Allows the crafting of Eris-style floors
 2023-03-09 20:51:18 -05:00
Nadyr
bde3f21b52 Merge pull request #5872 from Sharkmare/Gargoyle-abstraction 
Gargoyle Custimization round 1
 2023-03-09 20:48:55 -05:00
Nadyr
6862ce92ae Merge pull request #5869 from Sharkmare/patch-12 
Documentation on Coalesce and adds a docs folder
 2023-03-09 20:45:47 -05:00
Nadyr
306a6d9415 Merge pull request #5867 from Aroliacue/Aroliacue_Hive 
Adds TG Dragon Wings + new chomp_modular folder
 2023-03-09 20:42:30 -05:00
Nadyr
9ecf4c53ca Merge pull request #5870 from Sharkmare/patch-13 
Fixing a Unit test runtime on siffet
 2023-03-09 20:41:08 -05:00
Nadyr
3191dc8bd9 Merge pull request #5866 from tacoguy7765093/saltyandsweet 
Removed my bloat chem, replaces with inefficient glucose recipe
 2023-03-09 20:40:14 -05:00
Nadyr
2028a64669 Merge pull request #5865 from CHOMPStation2/upstream-merge-14592 
[MIRROR] Hopefully fixes stuck typing indicators when changing bubble mid-typing
 2023-03-09 20:38:52 -05:00
Nadyr
2143e762cf Merge pull request #5863 from Sharkmare/Advanced-voidsuit-no-more 
Replaces "advanced voidsuit" with hardsuit
 2023-03-09 20:37:46 -05:00
Nadyr
7baa5027ef Merge pull request #5857 from RinPin/master 
Adds green fox plushie!
 2023-03-09 20:37:03 -05:00
Nadyr
151fe34ba6 Merge pull request #5860 from Seris02/sockdigi 
digitigrade socks
 2023-03-09 20:36:17 -05:00
Nadyr
c53521a696 Merge pull request #5858 from Verkister/itemblorpies 
Adds item digestion noises.
 2023-03-09 20:35:37 -05:00
CHOMPStation2
44a675a96f Fixes some admin perms not being properly checked 2023-03-09 21:05:11 +00:00
Casey
96a7facbb6 Merge pull request #14641 from Heroman3003/admin-perm-fixes-also-sound 
Fixes some admin perms not being properly checked
 2023-03-09 21:05:11 +00:00
Sharkmare
346c20f84a Delete Nested_Lists.dm 2023-03-09 19:43:37 +01:00
CHOMPStation2
2b80eab86e [MIRROR] allows animations to be toggled in preferences 2023-03-09 05:22:26 +00:00
Heroman3003
0af4214f61 Merge pull request #14519 from VOREStation/upstream-merge-8944 
[MIRROR] allows animations to be toggled in preferences
 2023-03-09 05:22:26 +00:00
CHOMPStation2
32185af47f NIF damage minitweak 2023-03-09 05:22:21 +00:00
Heroman3003
0a49c21182 Merge pull request #14630 from KillianKirilenko/kk-mini2 
NIF damage minitweak
 2023-03-09 05:22:21 +00:00
CHOMPStation2
dc51faa2c9 [MIRROR] Fixes an oversight with default emote retrieval. 2023-03-09 05:17:02 +00:00
Heroman3003
b83f351431 Merge pull request #14607 from VOREStation/upstream-merge-8988 
[MIRROR] Fixes an oversight with default emote retrieval.
 2023-03-09 05:17:02 +00:00
CHOMPStation2
d7f7b0fec1 [MIRROR] Projectiles properly set starting var. 2023-03-09 05:16:57 +00:00
Heroman3003
a4a7079374 Merge pull request #14610 from VOREStation/upstream-merge-8997 
[MIRROR] Projectiles properly set starting var.
 2023-03-09 05:16:57 +00:00
Heroman3003
932301389a Fixes window icons on luxury yacht, nerfs royal spider eggs 2023-03-09 05:11:43 +00:00
CHOMPStation2
db32890fa6 stops robots from getting spammed on different z levels from cellcharge anomaly 2023-03-09 05:10:36 +00:00
Heroman3003
ccc5bb3afe Merge pull request #14584 from Seris02/anomalyfix 
stops robots from getting spammed on different z levels from cellcharge anomaly
 2023-03-09 05:10:36 +00:00
CHOMPStation2
cba8dc1e6c more fixed admin hrefs 2023-03-09 05:08:26 +00:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Bib Bob
db58f349a5 some metal 2023-03-08 20:08:17 -06:00
Heroman3003
68c300e087 Adds a Single Side Horn and Blade-Like Tail markings 2023-03-08 21:51:50 +00:00
Casey
f22503b5a2 Adds 'vore' objective 2023-03-08 21:47:38 +00:00
Sharkmare
5eec328c8c Recolorable Petrification code 2023-03-08 22:04:47 +01:00