Commit Graph

13724 Commits

Author SHA1 Message Date
Nadyr
af73e3da0a Merge pull request #4559 from CHOMPStation2/upstream-merge-13338
[MIRROR] Cleans up casino map a bit
2022-07-20 20:25:49 -04:00
Nadyr
887e13fb19 Merge branch 'master' into upstream-merge-13338 2022-07-20 20:10:05 -04:00
Nadyr
2dc10dacb4 Merge branch 'master' into upstream-merge-13335 2022-07-20 19:55:34 -04:00
Nadyr
b1c904123f Merge pull request #4548 from CHOMPStation2/upstream-merge-13321
[MIRROR] Adds light and heavy frame traits
2022-07-20 19:50:29 -04:00
Nadyr
259d1fd47d Merge pull request #4549 from CHOMPStation2/upstream-merge-13319
[MIRROR] Adds roulette balls
2022-07-19 20:55:00 -04:00
Nadyr
46be321937 Merge branch 'master' into upstream-merge-13321 2022-07-19 20:53:26 -04:00
Nadyr
005dc52ab3 powder that makes you say yes 2022-07-19 20:38:45 -04:00
Nadyr
2256f05ffc Merge branch 'master' into upstream-merge-13255 2022-07-19 20:35:56 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Nadyr
6a99a3dd7e Merge pull request #4425 from CHOMPStation2/upstream-merge-13178
[MIRROR] Adds Linguist and Polyglot traits
2022-07-19 20:16:05 -04:00
Nadyr
9341ddb87e powder that makes you say yes 2022-07-19 19:42:14 -04:00
Nadyr
4f8c6b2ccc adjusting due to upstream code changes 2022-07-19 19:37:53 -04:00
BlackMajor
9ee3e2688c Merge branch 'master' into upstream-merge-13336 2022-07-19 18:30:09 +12:00
BlackMajor
274c2207dd Update login.dm 2022-07-19 17:08:05 +12:00
Casey
d291375c7d Cleans up casino map a bit 2022-07-16 21:34:48 +00:00
Casey
30e1b0bf24 Adds digestion nutrition traits 2022-07-16 08:54:29 +00:00
Casey
f19463e5a9 Voice types! 2022-07-16 08:53:22 +00:00
Casey
022cebb0c9 Say Sound! 2022-07-16 01:37:06 +00:00
Casey
8d83d4d3fd Adds roulette balls 2022-07-15 22:31:00 +00:00
Casey
2ad683220b Adds light and heavy frame traits 2022-07-15 22:30:56 +00: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
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
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
Nadyr
b10fb48321 Merge pull request #4539 from CHOMPStation2/upstream-merge-13314
[MIRROR] Adds moth emotes
2022-07-11 21:46:24 -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
Casey
295829f8d2 Merge pull request #13314 from FunnyCatEnjoyer/FunnyCat
Adds moth emotes
2022-07-10 22:53:20 +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
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +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
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
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
Razgriz
6efc4b5673 Merge pull request #4494 from CHOMPStation2/upstream-merge-13221
[MIRROR] Reduces Post-Morten Pressure Damage
2022-07-03 17:18:57 -07:00
Razgriz
cfa1d304eb Merge pull request #4492 from CHOMPStation2/upstream-merge-13261
[MIRROR] Fixes a runtime preventing mob deletion
2022-07-03 17:17:30 -07:00
Razgriz
067d62d336 Merge pull request #4487 from CHOMPStation2/upstream-merge-13256
[MIRROR] Allows pAIs to use signlang
2022-07-03 17:15:48 -07:00
Razgriz
149dfc0d60 Merge pull request #4486 from CHOMPStation2/upstream-merge-13250
[MIRROR] Makes AI catslugs unable to access-locked doors
2022-07-03 17:15:41 -07:00
Razgriz
0eb34d57e1 Merge pull request #4472 from CHOMPStation2/upstream-merge-13237
[MIRROR] Fixes character setup failing to update species icons
2022-07-03 17:09:41 -07:00
Razgriz
c27e08b3e2 powder that makes you say yes 2022-07-03 17:08:06 -07:00
Casey
519acf4eda Merge pull request #13221 from liache/DeadPressurePatch
Reduces Post-Morten Pressure Damage
2022-07-03 16:17:42 +00:00
Casey
ca0f246e59 Merge pull request #13261 from Verkister/patch-115
Fixes a runtime preventing mob deletion
2022-07-03 16:15:30 +00:00
Casey
0942038444 Adds language preview to character setup 2022-07-03 09:09:35 +00:00
Casey
ab24ba2e01 Merge pull request #13256 from Heroman3003/pai-permit-sign
Allows pAIs to use signlang
2022-07-03 09:09:31 +00:00
Casey
b75a3a872c Merge pull request #13250 from Heroman3003/catslug-block
Makes AI catslugs unable to access-locked doors
2022-07-03 09:08:24 +00:00
Novacat
ca88e6c9fc Merge pull request #13237 from Heroman3003/setupfix
Fixes character setup failing to update species icons
2022-07-02 02:03:48 +00:00
Novacat
d13deeeac6 Merge pull request #13229 from Heroman3003/multiline-ooc-notes
Makes 'set ooc notes' use multiline textbox
2022-07-01 21:26:33 +00:00