Razgriz
878b53cf5e
Merge pull request #2713 from Cyrelius/revert-1395-revert-395-Razgriz1032-patch-74
...
Revert "Revert "Add quick authentic nif""
2021-08-03 20:20:48 -07:00
Aronai Sieyes
b93b572626
Merge pull request #11331 from VOREStation/Icons/skyratbenches
...
Skyrat benches
2021-08-04 02:50:20 +00:00
Nadyr
25124cedb6
Merge pull request #2718 from CHOMPStationBot/upstream-merge-11334
...
[MIRROR] Update vore space prot test
2021-08-02 20:50:45 -04:00
Nadyr
cd2b6d0e5a
Merge pull request #2717 from CHOMPStationBot/upstream-merge-11332
...
[MIRROR] Create a new empty zlevel for testing suffocation
2021-08-02 20:50:16 -04:00
Nadyr
c9cc1c75ec
Merge pull request #2716 from CHOMPStationBot/upstream-merge-11326
...
[MIRROR] Fixes the small hud buttons not getting hud colors
2021-08-02 20:49:43 -04:00
Aronai Sieyes
a4122ce793
Merge pull request #11334 from VOREStation/Arokha/spacevoretest
...
Update vore space prot test
2021-08-02 17:33:51 +00:00
Aronai Sieyes
880078a722
Merge pull request #11332 from VOREStation/Arokha/suffotest
...
Create a new empty zlevel for testing suffocation
2021-08-02 16:43:55 +00:00
Aronai Sieyes
dfd88b4ba7
Merge pull request #11326 from Verkister/hudbutts
...
Fixes the small hud buttons not getting hud colors
2021-08-02 13:40:43 +00:00
Verkister
2b855d9791
Fixes vorgan duping on relog
...
A recent thing made vorepanel delete on logout and spawn a new one on login, which erased the var that was supposed to tell the panel the vorgans had been already loaded. Moved that var from the panel to the mob.
2021-08-02 13:01:57 +03:00
Nadyr
c1256426da
Merge branch 'master' into upstream-merge-11324
2021-08-01 17:49:14 -04:00
Nadyr
f0d5ea81a4
Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773
...
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 17:47:09 -04:00
Nadyr
3dfa86b6fb
Merge pull request #2714 from Verkister/patch-26
...
Adds sanity check to prevent duplicate vorepanel
2021-08-01 17:37:07 -04:00
Nadyr
b942e02a7b
powder that makes you say yes
2021-08-01 17:30:48 -04:00
Nadyr
d6b32818b8
Merge pull request #2709 from CHOMPStationBot/upstream-merge-11177
...
[MIRROR] Reworks Shadekin eyecolors (again)
2021-08-01 16:11:54 -04:00
Nadyr
e9b3941615
Merge pull request #2707 from CHOMPStationBot/upstream-merge-11305
...
[MIRROR] Janitor Equipment Fix
2021-08-01 16:07:33 -04:00
Verkister
be57440206
Adds sanity check to prevent duplicate vorepanel
...
might be something to toss upstream but idk if it even affects them cause we got the special optimized load thing.
2021-08-01 23:05:19 +03:00
Nadyr
9a38017a08
powder that makes you say yes
2021-08-01 15:19:20 -04:00
Nadyr
4a5a743ad2
Merge pull request #2708 from CHOMPStationBot/upstream-merge-11297
...
[MIRROR] Overmap has smol skybox transparency
2021-08-01 15:12:55 -04:00
Nadyr
aa3c056af6
powder that makes you say yes
2021-08-01 15:11:58 -04:00
Nadyr
c343b80298
Merge pull request #2706 from CHOMPStationBot/upstream-merge-11322
...
[MIRROR] Fixes #11263
2021-08-01 15:09:45 -04:00
Nadyr
d91145bfa8
Merge pull request #2705 from CHOMPStationBot/upstream-merge-11320
...
[MIRROR] [MIRROR] New Jukebox
2021-08-01 15:09:20 -04:00
Nadyr
452a183f72
Merge pull request #2703 from CHOMPStationBot/upstream-merge-11323
...
[MIRROR] Fixes #11254
2021-08-01 15:08:21 -04:00
Cyrelius
158aba3eaf
Revert "Revert "Add quick authentic nif""
2021-08-01 11:04:13 -07:00
Chompstation Bot
0857ab35f3
Few more outdoors fixes
2021-08-01 16:26:38 +00:00
Chompstation Bot
21b6022a3a
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 15:41:46 +00:00
Chompstation Bot
e0900e747c
Reworks Shadekin eyecolors (again)
2021-08-01 14:48:52 +00:00
Aronai Sieyes
043dc972a5
Merge pull request #11297 from VOREStation/Arokha/skyboxtrans
...
Overmap has smol skybox transparency
2021-08-01 14:46:43 +00:00
Chompstation Bot
4090222cda
Janitor Equipment Fix
2021-08-01 14:45:35 +00:00
Aronai Sieyes
f6d29d3206
Merge pull request #11322 from VOREStation/Fixes/11263
...
Fixes #11263
2021-08-01 14:44:27 +00:00
Aronai Sieyes
8441496c1a
Merge pull request #11320 from VOREStation/upstream-merge-8190
...
[MIRROR] New Jukebox
2021-08-01 14:44:22 +00:00
Aronai Sieyes
e6fb50a3a4
Merge pull request #11323 from VOREStation/Fixes/11254
...
Fixes #11254
2021-08-01 14:43:07 +00:00
Aronai Sieyes
b61deb18d8
Merge pull request #11318 from VOREStation/upstream-merge-8186
...
[MIRROR] Cell Rack Update
2021-08-01 14:27:40 +00:00
Nadyr
1a38674550
Merge pull request #2696 from CHOMPStationBot/upstream-merge-11311
...
[MIRROR] Vore Panel and Character Setup HUD buttons
2021-08-01 00:06:19 -04:00
Nadyr
4e1149b326
Merge pull request #2700 from CHOMPStationBot/upstream-merge-11313
...
[MIRROR] Fix fake fox type
2021-07-31 23:53:00 -04:00
Nadyr
bd09da9db1
Merge pull request #2699 from CHOMPStationBot/upstream-merge-11314
...
[MIRROR] Warn before overwriting vore prefs as simple mobs
2021-07-31 23:52:40 -04:00
Nadyr
b6b6f8ed7c
Merge pull request #2698 from CHOMPStationBot/upstream-merge-11306
...
[MIRROR] Changes laptop glow from green to blue to match new sprites
2021-07-31 23:51:33 -04:00
Nadyr
8a720df372
powder that makes you say yes
2021-07-31 23:51:10 -04:00
Nadyr
bfe750247c
powder that makes you say yes
2021-07-31 23:47:40 -04:00
Nadyr
4b5f5a8367
powder that makes you say yes
2021-07-31 23:47:32 -04:00
Nadyr
6da01f2680
powder that makes you say yes
2021-07-31 23:46:19 -04:00
Aronai Sieyes
bb0a118a96
Merge pull request #11313 from VOREStation/Arokha/faketype
...
Fix fake fox type
2021-08-01 03:27:05 +00:00
Aronai Sieyes
0aec800448
Merge pull request #11314 from VOREStation/Arokha/panelwarn
...
Warn before overwriting vore prefs as simple mobs
2021-08-01 03:26:58 +00:00
Aronai Sieyes
56b13551f7
Merge pull request #11306 from Verkister/patch-76
...
Changes laptop glow from green to blue to match new sprites
2021-08-01 03:25:52 +00:00
Chompstation Bot
f0e0a6424b
Vore Panel and Character Setup HUD buttons
2021-08-01 03:25:38 +00:00
Razgriz
7290f14e26
Merge pull request #2694 from CHOMPStationBot/upstream-merge-11307
...
[MIRROR] Fixes dropnoms
2021-07-31 18:21:18 -07:00
Razgriz
4e847ee9d8
Merge pull request #2691 from Darlantanis/ballistics_revert
...
Revert ballistics overhaul
2021-07-31 18:20:48 -07:00
Aronai Sieyes
cfc6f4d594
Merge pull request #11307 from Verkister/patch-77
...
Fixes dropnoms
2021-08-01 00:23:25 +00:00
Nadyr
1aab6fcc45
Merge pull request #2693 from CHOMPStationBot/upstream-merge-11309
...
[MIRROR] Fixes eggless nurse/spider queens being able to lay eggs when player-controlled
2021-07-31 20:16:33 -04:00
Novacat
9c2276203f
Merge pull request #11309 from Heroman3003/BENEDICT
...
Fixes eggless nurse/spider queens being able to lay eggs when player-controlled
2021-07-31 23:53:52 +00:00
Darlantan
9604899135
Revert ballistics overhaul
2021-07-30 21:25:04 -04:00
