Razgriz
a53dc5fc80
Merge branch 'master' into OvermapPOI
2021-08-12 20:19:08 -07:00
Razgriz
04767aa9f1
Add fuel depot to overmap
...
Adds fuel depot to overmap. Its location will change in the future.
2021-08-12 20:17:51 -07:00
Razgriz
17a794f9da
Merge pull request #2781 from CHOMPStation2/Razgriz1032-patch-2
...
QOL comments for maps
2021-08-12 19:24:05 -07:00
Razgriz
aae5d78046
QOL comments for maps
2021-08-12 15:57:03 -07:00
Nadyr
6b5aad478a
Merge pull request #2776 from CHOMPStationBot/upstream-merge-11387
...
[MIRROR] Fixes infinite material duplication in R&D
2021-08-11 20:47:50 -04:00
Chompstation Bot
8e744102d2
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
Novacat
b291d87e18
Merge pull request #11387 from Heroman3003/dupefix
...
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
Nadyr
0445705e44
Merge pull request #2775 from CHOMPStationBot/upstream-merge-11385
...
[MIRROR] Adds extra text to maint pred and morph spawns
2021-08-10 19:24:15 -04:00
Chompstation Bot
d41a97bce9
Adds extra text to maint pred and morph spawns
2021-08-10 23:12:09 +00:00
Aronai Sieyes
4a39834222
Merge pull request #11385 from Very-Soft/maintpredintro
...
Adds extra text to maint pred and morph spawns
2021-08-10 23:12:09 +00:00
Nadyr
b8f11af55d
Merge pull request #2769 from CHOMPStationBot/upstream-merge-11375
...
[MIRROR] Ship eating skybox and emotes tweak
2021-08-09 19:48:13 -04:00
Nadyr
3a7dd9f4b0
Merge branch 'master' into upstream-merge-11375
2021-08-09 19:11:26 -04:00
Nadyr
57aeb22d12
Merge pull request #2766 from CHOMPStationBot/upstream-merge-11373
...
[MIRROR] Forgot DME change for ship eating
2021-08-09 19:10:10 -04:00
Nadyr
b8e33f7e77
Merge pull request #2771 from Verkister/churnexperiment
...
Some fixes for the experimental item gurgs
2021-08-09 18:53:40 -04:00
Nadyr
1ee2223dfd
Merge pull request #2767 from CHOMPStationBot/upstream-merge-11376
...
[MIRROR] non-departmental jackets
2021-08-09 18:51:06 -04:00
Nadyr
a37663439d
powder that makes you say yes
2021-08-09 18:50:21 -04:00
Nadyr
b32d433da4
Merge branch 'master' into upstream-merge-11373
2021-08-09 18:49:12 -04:00
Nadyr
b14d9e0c1d
Merge pull request #2765 from CHOMPStationBot/upstream-merge-11372
...
[MIRROR] Fixes #11369
2021-08-09 18:48:32 -04:00
Nadyr
0b635bc357
Merge pull request #2764 from CHOMPStationBot/upstream-merge-11367
...
[MIRROR] Fimxes shadekin eyecolors displaying wonkily
2021-08-09 18:47:56 -04:00
Nadyr
1bfc1eed7d
Merge pull request #2763 from CHOMPStationBot/upstream-merge-11368
...
[MIRROR] Port of monster860's animated doors to Bay closets
2021-08-09 18:47:36 -04:00
Nadyr
93da743bce
Merge pull request #2762 from CHOMPStationBot/upstream-merge-11370
...
[MIRROR] Allows you to eat spaceships
2021-08-09 18:46:50 -04:00
Nadyr
42ef5b2d27
Merge pull request #2761 from CHOMPStationBot/upstream-merge-11366
...
[MIRROR] Finally fixes "It's contains glorping slush"
2021-08-09 18:46:07 -04:00
Nadyr
d2e0ae0550
Merge pull request #2759 from CHOMPStationBot/upstream-merge-11360
...
[MIRROR] Fancy exploration shuttle
2021-08-09 18:45:46 -04:00
Verkister
caaa1994f7
Some fixes for the experimental item gurgs
...
- Tested to have fairly little effect on performance even with a large amount of contents (tested up to 150)
- Fixed a bunch of jank revealed in a live test.
- Also maybe optimizes the belly code by making the "for" part for items to skip the rest of the non-item checks.
2021-08-10 00:18:12 +03:00
Chompstation Bot
bc797521bb
Ship eating skybox and emotes tweak
2021-08-09 05:06:56 +00:00
Chompstation Bot
b111cd9267
non-departmental jackets
2021-08-09 04:59:38 +00:00
Aronai Sieyes
d69d52622f
Merge pull request #11376 from Hatterhat/nondep-jackets
...
non-departmental jackets
2021-08-09 04:59:38 +00:00
Chompstation Bot
5ec68fc911
Forgot DME change for ship eating
2021-08-09 03:42:25 +00:00
Chompstation Bot
af2fb17950
Fixes #11369
2021-08-09 03:41:19 +00:00
Aronai Sieyes
51f419b95d
Merge pull request #11372 from VOREStation/Fixes/11369
...
Fixes #11369
2021-08-09 03:41:19 +00:00
Chompstation Bot
1e3bcba04b
Fimxes shadekin eyecolors displaying wonkily
2021-08-09 03:29:02 +00:00
Aronai Sieyes
008c1ba080
Merge pull request #11367 from Heroman3003/eue-fix
...
Fimxes shadekin eyecolors displaying wonkily
2021-08-09 03:29:02 +00:00
Chompstation Bot
dd801c932d
Port of monster860's animated doors to Bay closets
2021-08-09 03:28:57 +00:00
Aronai Sieyes
7463a1bd6e
Merge pull request #11368 from VOREStation/Arokha/closetanim
...
Port of monster860's animated doors to Bay closets
2021-08-09 03:28:57 +00:00
Chompstation Bot
c19fb5f526
Allows you to eat spaceships
2021-08-09 03:28:52 +00:00
Aronai Sieyes
185dc898f4
Merge pull request #11370 from VOREStation/Arokha/shipnom
...
Allows you to eat spaceships
2021-08-09 03:28:52 +00:00
Chompstation Bot
568f5db048
Finally fixes "It's contains glorping slush"
2021-08-08 20:11:59 +00:00
Aronai Sieyes
9ea77444f9
Merge pull request #11366 from Verkister/patch-78
...
Finally fixes "It's contains glorping slush"
2021-08-08 20:11:59 +00:00
Chompstation Bot
ee735270ec
Fancy exploration shuttle
2021-08-08 18:48:28 +00:00
ExabyteDiscord
e333e564dd
Merge pull request #2757 from lbnesquik/Kot-message-3
...
Deletes all of the annoucement code to fix this stupid issue i am so upset >:(
2021-08-08 08:37:37 -07:00
lbnesquik
a67693dc35
Deletes all of the annoucement code to fix this stupid issue i am so upset >:(
2021-08-08 17:27:19 +02:00
ExabyteDiscord
e5d96ef508
Merge pull request #2756 from lbnesquik/Kot-message-2
...
Fixes broken spawn points by turning on the variable
2021-08-08 07:50:23 -07:00
lbnesquik
88eeb87f71
Fixes broken spawn points by turning on the variable
2021-08-08 16:33:04 +02:00
Razgriz
528399fc0e
Merge pull request #2746 from lbnesquik/Kot-message
...
Attempts to make it possible to v-belly spawn without an annoucement
2021-08-08 04:11:08 -07:00
Nadyr
949daef5b1
Merge pull request #2748 from CHOMPStation2/Razgriz1032-patch-9
...
Protean now gets default survival box
2021-08-08 06:38:36 -04:00
Nadyr
b99a4afe1b
Merge pull request #2745 from CHOMPStation2/Razgriz1032-patch-7
...
Use admin_verb_lists_vr instead
2021-08-08 06:38:09 -04:00
lbnesquik
193484f295
Comments
2021-08-08 10:25:08 +02:00
lbnesquik
65625ec033
Comments
2021-08-08 10:18:33 +02:00
Razgriz
701d9a62c4
Merge pull request #2751 from CHOMPStationBot/upstream-merge-11356
...
[MIRROR] Allows sipping proteans/prometheans
2021-08-08 01:07:23 -07:00
Razgriz
768f6e4f6e
Merge pull request #2737 from CHOMPStationBot/upstream-merge-11338
...
[MIRROR] New Floor Tanks
2021-08-08 01:06:27 -07:00
