cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,330 Commits 5 Branches 0 Tags
a987940682c02539d5738502698d9c1e28f87a79
Commit Graph

32745 Commits

Author SHA1 Message Date
Casey
a987940682 Merge pull request #13326 from VOREStation/upstream-merge-8662 
[MIRROR] Properly fixes holodeck landmark deletion
 2022-07-15 22:32:16 +00:00
Nadyr
494be6adef Merge pull request #4541 from CHOMPStation2/upstream-merge-12911 
[MIRROR] Lucky 7 Casino and Restaurant
 2022-07-13 19:44:05 -04:00
Nadyr
29487fd147 Merge pull request #4533 from CHOMPStation2/upstream-merge-13305 
[MIRROR] Mouse TF gibbing and also some gender things
 2022-07-13 19:30:44 -04:00
Nadyr
eb2c947a1b Merge pull request #4530 from CHOMPStation2/upstream-merge-13302 
[MIRROR] dying as a TFed mob in a tummy counts as a vore death
 2022-07-13 19:29:58 -04:00
Nadyr
0eb3389f4f Merge branch 'master' into upstream-merge-13305 2022-07-13 19:05:37 -04:00
Nadyr
11d9c8c63c Merge pull request #4529 from CHOMPStation2/upstream-merge-13301 
[MIRROR] Adds vore ventcrawl restriction to mice
 2022-07-13 19:03:57 -04:00
Nadyr
8f9e1af1ec Merge pull request #4528 from CHOMPStation2/upstream-merge-13299 
[MIRROR] Mouse ray supports OOC escape!
 2022-07-13 19:03:09 -04:00
Nadyr
6c14103200 Merge pull request #4526 from CHOMPStation2/upstream-merge-13287 
[MIRROR] Nehi fluff items
 2022-07-13 18:49:12 -04:00
Nadyr
cbf06e0112 Merge pull request #4543 from TheGreatKitsune/patch-3 
Fixes layering issues that could occur with shoes
 2022-07-13 18:48:03 -04:00
Nadyr
72a9701c40 Merge branch 'master' into upstream-merge-13299 2022-07-13 18:45:43 -04:00
Nadyr
b9a868b25a Merge pull request #4525 from CHOMPStation2/upstream-merge-13294 
[MIRROR] Mouse Ray
 2022-07-13 18:44:18 -04:00
TheGreatKitsune
911d8d1a66 Fixes layering issues that could occur with shoes 2022-07-12 21:20:23 -05:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Nadyr
b10fb48321 Merge pull request #4539 from CHOMPStation2/upstream-merge-13314 
[MIRROR] Adds moth emotes
 2022-07-11 21:46:24 -04:00
Nadyr
806441acd2 Merge pull request #4536 from CHOMPStation2/upstream-merge-13311 
[MIRROR] Makes unban panel bans also kick players in process
 2022-07-11 21:44:32 -04:00
Nadyr
d2fb017cb5 Merge pull request #4534 from CHOMPStation2/upstream-merge-13307 
[MIRROR] Makes all holders use micro holder examine logic
 2022-07-11 21:43:24 -04:00
Nadyr
a84b5a6cd7 powder that makes you say yes 2022-07-11 21:39:59 -04:00
Nadyr
ff2abbbf4e powder that makes you say yes 2022-07-11 21:36:58 -04:00
Nadyr
2ea449add7 powder that makes you say yes 2022-07-11 21:12:08 -04:00
Nadyr
eae946fdb8 powder that makes you say yes 2022-07-11 21:05:35 -04:00
Nadyr
726fb9422b Merge pull request #4523 from CHOMPStation2/upstream-merge-13284 
[MIRROR] Fixes spam of 'you finished drinking' when trying to drink from empty glass
 2022-07-11 20:58:06 -04:00
Nadyr
0a6dc8d037 Merge pull request #4517 from CHOMPStation2/upstream-merge-13281 
[MIRROR] Fixes Vorepanel UI Bugs
 2022-07-11 20:57:52 -04:00
Nadyr
ce598be562 Merge pull request #4522 from CHOMPStation2/upstream-merge-13289 
[MIRROR] Fixes tgui issues and also roundstart job slots getting occupied by nothing when spawning fails
 2022-07-11 20:42:06 -04:00
Nadyr
5a68b2c917 Merge pull request #4521 from CHOMPStation2/upstream-merge-13292 
[MIRROR] Fix setting the minimum examine message size to 0
 2022-07-11 20:40:29 -04:00
Casey
d18cb0e1e2 Fixes Vorepanel UI Bugs 2022-07-11 20:28:56 -04:00
Nadyr
d9c3aa71d6 Merge pull request #4516 from CHOMPStation2/upstream-merge-13282 
[MIRROR] Fixes DIY foods not getting reagents from ingridients
 2022-07-11 20:27:25 -04:00
Nadyr
6423971cd6 Merge pull request #4515 from CHOMPStation2/upstream-merge-13283 
[MIRROR] Adds recolourable hoodies with functional hoods
 2022-07-11 20:26:41 -04:00
Nadyr
5cc3d048ef Merge pull request #4512 from CHOMPStation2/upstream-merge-13276 
[MIRROR] Fixes speech bubble appearing on blank messages
 2022-07-11 19:54:31 -04:00
Casey
295829f8d2 Merge pull request #13314 from FunnyCatEnjoyer/FunnyCat 
Adds moth emotes
 2022-07-10 22:53:20 +00:00
BlackMajor
764d7847a6 Update tools.dm 2022-07-10 16:52:21 +12:00
Casey
8788a1cabe Merge pull request #13311 from Heroman3003/kick-ban 
Makes unban panel bans also kick players in process
 2022-07-09 21:01:00 +00:00
Casey
3cd5f96b3a Merge pull request #13307 from Heroman3003/holder-examine 
Makes all holders use micro holder examine logic
 2022-07-09 06:35:32 +00:00
Casey
ba3f9f1859 Mouse TF gibbing and also some gender things 2022-07-09 01:47:53 +00:00
Casey
31a43f7d0a Merge pull request #13302 from Very-Soft/accountformouse 
dying as a TFed mob in a tummy counts as a vore death
 2022-07-08 16:06:52 +00:00
Casey
8a9c17aff1 Merge pull request #13301 from Heroman3003/vmice-crawl 
Adds vore ventcrawl restriction to mice
 2022-07-08 05:58:47 +00:00
Casey
93b3383ec9 Mouse ray supports OOC escape! 2022-07-08 04:33:06 +00:00
Casey
f43c530c46 Merge pull request #13287 from ZodiacShadow/Zodiac 
Nehi fluff items
 2022-07-08 00:36:49 +00:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Casey
677e1fece3 Merge pull request #13284 from Heroman3003/drinkfix 
Fixes spam of 'you finished drinking' when trying to drink from empty glass
 2022-07-08 00:31:22 +00:00
Casey
090aa3dc3b Merge pull request #13289 from Heroman3003/tgui-jobstart-fixes 
Fixes tgui issues and also roundstart job slots getting occupied by nothing when spawning fails
 2022-07-08 00:31:18 +00:00
Casey
1746303591 Merge pull request #13292 from TheGreatKitsune/examine-size-fix 
Fix setting the minimum examine message size to 0
 2022-07-08 00:31:13 +00:00
Casey
f2a4447329 Merge pull request #13282 from Heroman3003/diy-food-fix 
Fixes DIY foods not getting reagents from ingridients
 2022-07-08 00:29:49 +00:00
Casey
f0efe74732 Merge pull request #13283 from faaaay/master 
Adds recolourable hoodies with functional hoods
 2022-07-08 00:29:44 +00:00
Casey
f4cd5db137 Merge pull request #13276 from Heroman3003/textbubble-fix 
Fixes speech bubble appearing on blank messages
 2022-07-08 00:28:29 +00:00
Razgriz
cfc5d475fa Merge pull request #4504 from VictorZisthus/bulletpen-fix 
Shuttle/Voidcraft Hotfix
 2022-07-04 21:25:27 -07:00
Razgriz
41b23b1b8d Merge pull request #4502 from TheGreatKitsune/Nar-sour-fix 
Fix Nar'Sour's result amount
 2022-07-04 21:24:56 -07:00
Razgriz
80fbb36627 Merge pull request #4498 from CHOMPStation2/upstream-merge-13267 
[MIRROR] That nice glow
 2022-07-04 21:24:50 -07:00
Razgriz
2923205b48 Merge pull request #4467 from CHOMPStation2/upstream-merge-13232 
[MIRROR] Makes gateway-spawned solargrubs not tracked by solargrub event
 2022-07-04 21:24:46 -07:00
Victor Zisthus
245591be95 Shuttle/Voidcraft Hotfix 
Updates Shuttlecraft and Voidcraft to be visible by bullet penetration code. Things designed to fly in space at high speeds with lots of little rocks present are not gonna feel bullets all that much.
 2022-07-03 23:06:28 -04:00
TheGreatKitsune
454560d83f Fix Nar'Sour's result amount 2022-07-03 21:12:39 -05:00