Nadyr
b36ea96802
Merge pull request #1694 from CHOMPStationBot/upstream-merge-10035
...
[MIRROR] Makes weaversilk webs die from everything, not just fists + stun timer fix
2021-03-30 02:30:48 -04:00
Nadyr
5c3d16c981
Update station.dm
2021-03-30 01:20:26 -04:00
Nadyr
a777f6993d
Merge branch 'master' into upstream-merge-10025
2021-03-30 00:58:05 -04:00
Novacat
abc5fc05a0
Merge pull request #10035 from Heroman3003/weak-ass-webs
...
Makes weaversilk webs die from everything, not just fists + stun timer fix
2021-03-29 13:43:50 +00:00
Nadyr
6bfb9208b8
Merge pull request #1690 from CHOMPStationBot/upstream-merge-10031
...
[MIRROR] Readds closed eyes marking
2021-03-28 21:57:27 -04:00
Nadyr
81d55a1cb2
Merge pull request #1682 from MisterGrimm/Genaprawns
...
Player Xenomorph Overhaul 1.1 , the Genaprawns
2021-03-28 21:53:36 -04:00
Chompstation Bot
1ad694dcf0
[MIRROR] Repathed/renamed seromi to teshari.
2021-03-28 21:33:04 +00:00
Novacat
76a7baf3b6
Merge pull request #10031 from Verkister/patch-44
...
Readds closed eyes marking
2021-03-28 18:11:50 +00:00
Nadyr
5f8c69528b
Update sprite_accessories_tail_vr.dm
2021-03-28 00:25:16 -04:00
Novacat
49249666eb
Merge pull request #10026 from VOREStation/upstream-merge-7997
...
[MIRROR] Fixes naked ghosts
2021-03-27 03:16:52 +00:00
Sym
382673b6c6
More comment fixes
2021-03-26 20:21:14 -04:00
Sym
c7deb2560e
Fixing naming issues
2021-03-26 20:07:12 -04:00
Sym
5336155061
Cleaning up
2021-03-26 19:49:37 -04:00
Sym
d4da23b830
Adding comment
2021-03-26 19:44:34 -04:00
Sym
8ca11f0439
Changing player Xenomorphs to Genaprawns
2021-03-26 19:42:08 -04:00
Nadyr
23e66df8db
Merge branch 'master' into upstream-merge-9992
2021-03-26 04:12:28 -04:00
Nadyr
e98859942f
Merge branch 'master' into upstream-merge-9974
2021-03-26 03:57:31 -04:00
Nadyr
4ce40dad53
Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955
...
[MIRROR] [MIRROR] Added think-tanks.
2021-03-26 03:50:02 -04:00
Razgriz
2f1d9caf1b
Merge branch 'master' into Razgriz1032-patch-10
2021-03-25 23:40:30 -07:00
Nadyr
b8d7d7df69
Merge pull request #1185 from CHOMPStation2/ProteanNerf
...
Protean living Hardsuit, nerf refactory, remove ventcrawl
2021-03-26 01:34:04 -04:00
Razgriz
81813d7ed9
Enable proteans
2021-03-25 22:08:22 -07:00
Novacat
9143373aa3
Merge pull request #10017 from Heroman3003/bubblefix
...
Makes typing indicators scale again
2021-03-25 17:57:54 +00:00
Razgriz
66efecfd37
Update protean_blob.dm
2021-03-24 17:30:18 -07:00
Razgriz
223884b27c
Merge branch 'master' into ProteanNerf
2021-03-24 17:24:15 -07:00
Razgriz
338f475794
Update protean_blob.dm
2021-03-24 16:11:26 -07:00
Razgriz
5acfa195d0
Update protean_blob.dm
2021-03-24 16:04:45 -07:00
Razgriz
bacbc43b1b
Update protean_blob.dm
2021-03-24 16:02:06 -07:00
Novacat
b3545f16e1
Merge pull request #10009 from Verkister/patch-43
...
Fixes a thing that somehow never got mirrored here
2021-03-24 12:30:45 +00:00
Razgriz
2c6b9017c4
Merge pull request #1646 from Verkister/voreload
...
Fixes and optimizes vorepref loading.
2021-03-23 19:12:29 -07:00
Novacat
0a0440ed9c
Merge pull request #10001 from Novacat/nova-basicfixes
...
Technomancer Fixes
2021-03-23 20:01:01 +00:00
Nadyr
0e6dc7a83e
Merge pull request #1648 from CHOMPStationBot/upstream-merge-9978
...
[MIRROR] Adds Xenochimera variants of some positive and negative traits
2021-03-23 00:25:36 -04:00
Verkister
6d83de8595
bruh who the fuck put spaces in here?
2021-03-22 14:03:07 +02:00
Verkister
1ea82864e1
I thought parent returns used to mean something ffs
2021-03-22 13:59:27 +02:00
Verkister
710316dce3
so many fixes bleh
...
-Not even gonna bother marking these as edits. Will be porting upstream as well.
2021-03-22 13:34:39 +02:00
Verkister
bb3571c810
Adds on-demand belly loading for simplemobs.
...
-Voremob bellies only get loaded in when they either try to use the belly or open their vorepanel (in case of player-controlled mobs)
2021-03-22 13:09:22 +02:00
BlackMajor
5adee22503
Update boozeborg_ch.dm
2021-03-22 21:23:30 +13:00
Chompstation Bot
5a3ff731fc
[MIRROR] Removed inactive platforms from the end of round laws output, gives them pilot access.
2021-03-22 04:39:36 +00:00
Novacat
3d7e7a2155
Merge pull request #9978 from Tenryumi/xenochimera-traits
...
Adds Xenochimera variants of some positive and negative traits
2021-03-22 00:02:16 +00:00
Verkister
2059c83bc2
Fixes and optimizes vorepref loading.
...
-Voreprefs are now loaded when the character loads as they used to be. The initial load only gives one usable belly while the rest are loaded when the vorepanel is opened.
-Now that the prefs are loaded at an appropriate time again, the forced defaults to disable everything are no longer a prefbreak concern.
-Un-spaghettifies an "optimization" into an optimization.
-Fixes voreprefs not loading when they should load.
2021-03-21 23:36:15 +02:00
Nadyr
93100c6d00
Merge pull request #1623 from CHOMPStationBot/upstream-merge-9956
...
[MIRROR] [MIRROR] Ported Poppy the possum.
2021-03-21 05:17:47 -04:00
Nadyr
84be4c5e38
Update component.dm
2021-03-21 05:03:29 -04:00
Nadyr
d30b84896a
Merge pull request #1602 from CHOMPStationBot/upstream-merge-9938
...
[MIRROR] Makes shadekin not have glowing eyes by default
2021-03-21 04:30:37 -04:00
Nadyr
5e403b1797
Merge pull request #1597 from CHOMPStationBot/upstream-merge-9932
...
[MIRROR] Fixes char setup failing to update sizes/shapes
2021-03-21 04:27:42 -04:00
Nadyr
fe2b26c4d9
Merge branch 'master' into upstream-merge-9932
2021-03-21 04:17:12 -04:00
Nadyr
63ac2eff35
Merge branch 'master' into upstream-merge-9926
2021-03-21 03:59:48 -04:00
Nadyr
412a246c81
Update update_icons.dm
2021-03-21 03:47:31 -04:00
Nadyr
861af3c483
Update sprite_accessories_vr.dm
2021-03-21 03:00:41 -04:00
Nadyr
cc8241a403
Update sprite_accessories_vr.dm
2021-03-21 02:57:27 -04:00
Nadyr
0768856220
fuck me
2021-03-21 02:49:39 -04:00
Nadyr
0281b47f96
Update living_defines.dm
2021-03-21 02:21:46 -04:00
