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
30329906ea
Merge pull request #2712 from CHOMPStationBot/upstream-merge-11324
...
[MIRROR] Few more outdoors fixes
2021-08-01 18:07:30 -04: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
049a8d1c10
powder that makes you say yes
2021-08-01 17:36:12 -04:00
Nadyr
b942e02a7b
powder that makes you say yes
2021-08-01 17:30:48 -04:00
Nadyr
bc612ba5f9
powder that makes you say yes
2021-08-01 17:27:32 -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
c7b59deb51
powder that makes you say yes
2021-08-01 15:17:45 -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
799a84a217
Merge pull request #2704 from CHOMPStationBot/upstream-merge-11316
...
[MIRROR] Adds in new vine and coils belly overlays
2021-08-01 15:08:49 -04:00
Nadyr
452a183f72
Merge pull request #2703 from CHOMPStationBot/upstream-merge-11323
...
[MIRROR] Fixes #11254
2021-08-01 15:08:21 -04:00
Nadyr
a2099d5770
Merge pull request #2702 from CHOMPStationBot/upstream-merge-11321
...
[MIRROR] [MIRROR] Taser Update
2021-08-01 15:07:52 -04:00
Nadyr
2723e97f4b
Merge pull request #2701 from CHOMPStationBot/upstream-merge-11318
...
[MIRROR] [MIRROR] Cell Rack Update
2021-08-01 15:07:19 -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
Chompstation Bot
8745bf871a
Overmap has smol skybox transparency
2021-08-01 14:46:43 +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
Chompstation Bot
b0c783ed50
Fixes #11263
2021-08-01 14:44:27 +00:00
Aronai Sieyes
f6d29d3206
Merge pull request #11322 from VOREStation/Fixes/11263
...
Fixes #11263
2021-08-01 14:44:27 +00:00
Chompstation Bot
4a02212ee5
[MIRROR] New Jukebox
2021-08-01 14:44:22 +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
Chompstation Bot
46d38b4b27
Adds in new vine and coils belly overlays
2021-08-01 14:44:15 +00:00
Aronai Sieyes
4eb657be01
Merge pull request #11316 from H0lySquirr3l/master
...
Adds in new vine and coils belly overlays
2021-08-01 14:44:14 +00:00
Chompstation Bot
0d8f92ddd0
Fixes #11254
2021-08-01 14:43:07 +00:00
Aronai Sieyes
e6fb50a3a4
Merge pull request #11323 from VOREStation/Fixes/11254
...
Fixes #11254
2021-08-01 14:43:07 +00:00
Chompstation Bot
db879b9a5c
[MIRROR] Taser Update
2021-08-01 14:36:55 +00:00
Aronai Sieyes
d9255b4897
Merge pull request #11321 from VOREStation/upstream-merge-8189
...
[MIRROR] Taser Update
2021-08-01 14:36:55 +00:00
Chompstation Bot
e48fb1ade3
[MIRROR] Cell Rack Update
2021-08-01 14:27:40 +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
Nadyr
ceb468ec8e
Merge pull request #2695 from CHOMPStationBot/upstream-merge-11312
...
[MIRROR] Fix pilot uniform icon
2021-07-31 23:36:53 -04:00
