cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,642 Commits 8 Branches 0 Tags
4ce40dad53730f9176b51c0bb92b3e0bc06e14dc
Commit Graph

29028 Commits

Author SHA1 Message Date
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
Razgriz
1dfc45839d Merge pull request #1672 from CHOMPStationBot/upstream-merge-10022 
[MIRROR] [MIRROR] Fixes mapped R-UST connections, removes debug logs
 2021-03-25 19:21:53 -07:00
Razgriz
08c2f7e2d4 Merge pull request #1670 from CHOMPStationBot/upstream-merge-10019 
[MIRROR] [MIRROR] Fixes replica syndi suit worn sprite
 2021-03-25 19:12:16 -07:00
Razgriz
6d2ba60adf Update rustfuel_control.dm 2021-03-25 19:08:05 -07:00
Razgriz
a5135abd5a Update rustcore_monitor.dm 2021-03-25 19:07:47 -07:00
Razgriz
b905c60242 Update rustcore_monitor.dm 2021-03-25 19:07:30 -07:00
Razgriz
c70a26ffc6 Update gyrotron_control.dm 2021-03-25 19:07:02 -07:00
Chompstation Bot
fb6e49df04 [MIRROR] Fixes mapped R-UST connections, removes debug logs 2021-03-26 01:21:46 +00:00
Razgriz
58453d43b2 Merge pull request #1671 from CHOMPStationBot/upstream-merge-10020 
[MIRROR] [MIRROR] Fixes roofing tiles not working in multiz areas
 2021-03-25 14:15:30 -07:00
Novacat
3d48605bfc Merge pull request #10020 from VOREStation/upstream-merge-7989 
[MIRROR] Fixes roofing tiles not working in multiz areas
 2021-03-25 18:36:52 +00:00
Novacat
8d7ccced0b Merge pull request #10019 from VOREStation/upstream-merge-7960 
[MIRROR] Fixes replica syndi suit worn sprite
 2021-03-25 18:36:46 +00:00
Novacat
9143373aa3 Merge pull request #10017 from Heroman3003/bubblefix 
Makes typing indicators scale again
 2021-03-25 17:57:54 +00:00
Razgriz
ceb72dd0ec Merge pull request #1658 from CHOMPStationBot/upstream-merge-10004 
[MIRROR] [MIRROR] ~~Deletes unused var.~~ makes it a virgo edit instead
 2021-03-25 01:17:08 -07:00
Razgriz
1a63dbf7f2 Merge pull request #1659 from CHOMPStationBot/upstream-merge-10009 
[MIRROR] Fixes a thing that somehow never got mirrored here
 2021-03-25 01:16:58 -07:00
Razgriz
9d2aa87605 Update standard.dm 2021-03-25 01:05:14 -07: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
3df8fe3983 Update alien_ch.dm 2021-03-24 17:17:51 -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
Razgriz
5b36240d21 Update alien_ch.dm 2021-03-24 15:44:59 -07:00
Razgriz
7f6e976bf2 Update alien_ch.dm 2021-03-24 15:23:48 -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
679f2bc1ae Comment out "to_world" for rust consoles 
WHY WOULD YOU DO THAT
 2021-03-24 04:55:09 -07:00
Razgriz
2c6b9017c4 Merge pull request #1646 from Verkister/voreload 
Fixes and optimizes vorepref loading.
 2021-03-23 19:12:29 -07:00
Chompstation Bot
ba2809d959 [MIRROR] Deletes unused var. 2021-03-23 23:19:34 +00: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
Nadyr
42faea6af6 Merge pull request #1642 from CHOMPStationBot/upstream-merge-9982 
[MIRROR] Fixes scaling mode toggle verb not persisting
 2021-03-23 00:23:42 -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
Razgriz
5631fd1782 Merge pull request #1636 from Armyguy/master 
Fixs issue 1171
 2021-03-22 01:17:56 -07: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
Novacat
9c209652a9 Merge pull request #9988 from VOREStation/upstream-merge-7973 
[MIRROR] News Update  + Communicator Lag Fix
 2021-03-21 21:25:45 +00:00
Novacat
50dc436f52 Merge pull request #9982 from Verkister/patch-42 
Fixes scaling mode toggle verb not persisting
 2021-03-21 19:37:54 +00:00
Nadyr
7e2890409e Merge pull request #1633 from CHOMPStationBot/upstream-merge-9944 
[MIRROR] Fix Missing DSI Roboparts
 2021-03-21 05:26:00 -04: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
5fc2ffbee7 Merge branch 'master' into upstream-merge-9944 2021-03-21 05:15:17 -04:00
Nadyr
16b8fc040c Update standard.dm 2021-03-21 04:49:12 -04:00
Nadyr
5b1aa3dc20 Merge pull request #1611 from CHOMPStationBot/upstream-merge-9951 
[MIRROR] Fixes prefless carbonmobs defaulting to fuzzy mode
 2021-03-21 04:32:21 -04:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 
[MIRROR] [MIRROR] Added Doctress' Jager drink.
 2021-03-21 04:31:54 -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