Commit Graph

12476 Commits

Author SHA1 Message Date
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Unknown
fd3a02f318 Fixes SSMobs Shattering due to Proteans
Port of https://github.com/PolarisSS13/Polaris/pull/8073
2021-05-11 03:31:24 -05:00
Nadyr
88b1b04bd8 Merge branch 'master' into upstream-merge-10247 2021-05-10 01:30:24 -04:00
ZVB334
ac9b79b737 Commented out sneeze because sneezeb was causing issues, ie, getting cut off 2021-05-09 16:31:36 -05:00
Nadyr
b5566ff403 Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268
[MIRROR] Adds a big batch of mobs to maint pred pool
2021-05-09 07:47:25 -04:00
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
2021-05-09 07:39:11 -04:00
Nadyr
08fac1ebbe Update giant_spider_vr.dm 2021-05-09 07:36:31 -04:00
Nadyr
aef0b3ab2c Update emote.dm 2021-05-09 07:07:43 -04:00
Nadyr
2ddabe9183 Update emote.dm 2021-05-09 06:59:06 -04:00
Nadyr
e754329bdb Update teshari.dm 2021-05-09 06:57:16 -04:00
Nadyr
688acf0711 Update species.dm 2021-05-09 06:48:55 -04:00
Nadyr
baf0aae073 Update species.dm 2021-05-09 06:42:43 -04:00
Nadyr
e75a3b1354 Update emote_vr.dm 2021-05-09 06:36:29 -04:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Chompstation Bot
78593f1c11 Adds a big batch of mobs to maint pred pool 2021-05-09 01:37:07 +00:00
Nadyr
1cbf5d65ac Merge pull request #1903 from CHOMPStationBot/upstream-merge-8912
[MIRROR] Fix view spinning reversing movement controls
2021-05-08 08:02:22 -04:00
Nadyr
37285e87dd Merge pull request #1906 from CHOMPStationBot/upstream-merge-10250
[MIRROR] Remove the lore blurb that pollutes the new player menu
2021-05-08 07:57:36 -04:00
Nadyr
0ec2104c69 Merge pull request #1902 from CHOMPStationBot/upstream-merge-9254
[MIRROR] Rabbits don't bumpnom anymore
2021-05-08 07:52:23 -04:00
Nadyr
70840e8d6b Merge pull request #1886 from CHOMPStationBot/upstream-merge-10252
[MIRROR] Fixes carbon shadekin traits
2021-05-08 06:43:55 -04:00
Aronai Sieyes
4c92adb3e2 Merge pull request #10250 from ShadowLarkens/lore_blurb_dumb
Remove the lore blurb that pollutes the new player menu
2021-05-06 17:48:35 +00:00
Novacat
7995082a3e Merge pull request #8912 from ShadowLarkens/clientdirmovement
Fix view spinning reversing movement controls
2021-05-06 16:42:09 +00:00
Novacat
62064fdfae Merge pull request #9254 from Cyantime/patch-1
Rabbits don't bumpnom anymore
2021-05-06 16:32:53 +00:00
Chompstation Bot
f38a740237 [MIRROR] Body style selection and sanitizing refactor. 2021-05-05 18:46:14 +00:00
Novacat
adce906d78 Merge pull request #10252 from Random-1245/shadekin-traits-fix
Fixes carbon shadekin traits
2021-05-05 18:45:59 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00
Novacat
0292d2071c Merge pull request #10248 from VOREStation/upstream-merge-8058
[MIRROR] Swaps emote(me) out for custom_emote().
2021-05-05 18:45:19 +00:00
Nadyr
1930a85c2c Merge pull request #1854 from CHOMPStationBot/upstream-merge-10208
[MIRROR] Makes Protean blobform less robust
2021-04-30 00:54:38 -04:00
Nadyr
cb415c440c Merge pull request #1850 from CHOMPStationBot/upstream-merge-10202
[MIRROR] Fixes voremob icon updates messing with scaling
2021-04-30 00:41:13 -04:00
Novacat
ba3c3e7031 Merge pull request #10208 from Novacat/nova-basicfixes
Makes Protean blobform less robust
2021-04-26 15:02:57 +00:00
Novacat
4f56cc5b9d Merge pull request #10202 from Verkister/patch-48
Fixes voremob icon updates messing with scaling
2021-04-25 04:41:11 +00:00
Chompstation Bot
f8055f9674 [MIRROR] Updates all bots to use TGUI, and adds mute button for certain bots 2021-04-23 04:30:04 -04:00
Nadyr
bf2caae1b1 Merge pull request #1819 from CHOMPStationBot/upstream-merge-10165
[MIRROR] TGUI Fix Compilation
2021-04-23 03:34:53 -04:00
Novacat
40535241c9 Merge pull request #10186 from VOREStation/upstream-merge-8038
[MIRROR] Lying on the ground can be left or right
2021-04-21 06:48:13 +00:00
Chompstation Bot
1bc56b471f TGUI Fix Compilation 2021-04-19 18:13:08 +00:00
Nadyr
d15ddded40 fix icon via inheritence 2021-04-18 03:30:52 -04:00
Razgriz
1f05b0e1cf Merge pull request #1807 from ZVB334/BorerTweak
Hides Borers from Health HUDs
2021-04-13 20:30:43 -07:00
Razgriz
d8537574c0 Merge pull request #1809 from Darlantanis/RacoonsAndImplants
Backup Implanter, Raccoons
2021-04-13 20:30:28 -07:00
Razgriz
54da2e9f6a Merge pull request #1812 from CHOMPStationBot/upstream-merge-10153
[MIRROR] Fixes Xenochimera Custom Traits
2021-04-13 12:05:59 -07:00
Novacat
2ec3f25ba9 Merge pull request #10153 from Novacat/nova-ert
Fixes Xenochimera Custom Traits
2021-04-13 18:17:32 +00:00
Novacat
373dd4ff8e Merge pull request #10150 from Nyksia/final-species-fix
Final species fix (don't jinx it)
2021-04-13 12:22:34 +00:00
Darlantan
6806e7d9b5 Implanter, raccoons 2021-04-13 04:31:10 -04:00
ZVB334
ea5ed6f1fa Update life.dm 2021-04-12 15:39:32 -05:00
Razgriz
dcc9332d84 Update blank_vr.dm 2021-04-12 12:13:32 -07:00
Chompstation Bot
36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Verkister
528aa98d95 Earlyports traits fix
ascian went to sleep
2021-04-12 11:10:35 +03:00
Razgriz
72ad3bf1fb spelling 2021-04-11 23:44:06 -07:00
Nadyr
e0c61bacf5 Merge pull request #1795 from CHOMPStationBot/upstream-merge-10129
[MIRROR] Miscellaneous Sundries
2021-04-11 23:11:43 -04:00
Nadyr
341f981d20 Merge pull request #1800 from CHOMPStationBot/upstream-merge-10136
[MIRROR] Extra hot species fix or how not to forget things
2021-04-11 23:00:57 -04:00
Razgriz
294a04e775 Merge pull request #1765 from CHOMPStationBot/upstream-merge-10097
[MIRROR] Fixes protean blobs using the wrong list of edible materials
2021-04-11 19:57:58 -07:00
Nadyr
2b021722f3 Merge branch 'master' into upstream-merge-10136 2021-04-11 22:51:30 -04:00