Razgriz
18481e157f
Protean now gets default survival box
2021-08-07 14:25:25 -07:00
Razgriz
51de772050
Merge pull request #2734 from CHOMPStationBot/upstream-merge-11349
...
[MIRROR] Make a borer subtype for adminbuse
2021-08-06 23:12:19 -07:00
Razgriz
dc1f939744
Merge pull request #2739 from CHOMPStationBot/upstream-merge-11342
...
[MIRROR] Skyrat connected consoles
2021-08-06 22:37:16 -07:00
Razgriz
0a8469ab89
Merge pull request #2738 from Verkister/churnexperiment
...
Adds a new experimental item digestion mode
2021-08-06 22:32:51 -07:00
Razgriz
dc5d09737b
Merge pull request #2743 from CHOMPStationBot/upstream-merge-11355
...
[MIRROR] Fix for Issue #11354
2021-08-06 22:29:53 -07:00
Aronai Sieyes
846f4e42d1
Merge pull request #11355 from GhostActual/fixitfixitfixit
...
Fix for Issue #11354
2021-08-06 22:16:01 +00:00
Aronai Sieyes
8cfb426ef7
Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps
...
Skyrat connected consoles
2021-08-06 21:47:09 +00:00
Verkister
b923f7a3e4
Adds a new experimental item digestion mode that divides the digestion damage between all items within the gut instead of going through one item at a time. Disabled by default.
...
Experimental because I don't know how badly it affects performance and because I'm feeling too lazy to make a vorepanel button for it rn, so it's a varedit toggle for now.
2021-08-06 23:33:12 +03:00
Verkister
e6eb01b9bb
Adds new experimental item digestion mode
...
Adds a new experimental item digestion mode that divides the digestion damage between all items within the gut instead of going through one item at a time.
Experimental because I don't know how much it affects performance and because I'm feeling too lazy for the hassle making a vorepanel button for it rn, so it's a varedit toggle for now.
2021-08-06 23:06:04 +03:00
Novacat
d072b0923b
Merge pull request #11349 from VOREStation/Arokha/barerrerr
...
Make a borer subtype for adminbuse
2021-08-06 15:01:22 +00:00
Novacat
30f4f6dafb
Merge pull request #11350 from VOREStation/Fixes/11061
...
Fixes #11061
2021-08-06 15:00:09 +00:00
Nadyr
e5bbed59f1
Merge pull request #2728 from CHOMPStationBot/upstream-merge-11337
...
[MIRROR] SMART Rifle
2021-08-05 19:52:58 -04:00
Nadyr
7526eaeb3d
Merge pull request #2726 from CHOMPStationBot/upstream-merge-11335
...
[MIRROR] Skyrat rack sprite
2021-08-05 19:26:43 -04:00
Chompstation Bot
9acfa8fcca
SMART Rifle
2021-08-05 21:48:45 +00:00
Aronai Sieyes
dc78d48279
Merge pull request #11335 from VOREStation/Icons/srrack
...
Skyrat rack sprite
2021-08-05 20:42:25 +00:00
Aronai Sieyes
edda5a3198
Merge pull request #11328 from VOREStation/Icons/fieldgen
...
Skyrat field generator sprites
2021-08-05 20:31:02 +00:00
Aronai Sieyes
4b9e352590
Merge pull request #11340 from GhostActual/recipe-fix
...
Fix for issue #11339
2021-08-04 21:35:28 +00:00
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
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
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
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
c343b80298
Merge pull request #2706 from CHOMPStationBot/upstream-merge-11322
...
[MIRROR] Fixes #11263
2021-08-01 15:09:45 -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
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
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
Chompstation Bot
f0e0a6424b
Vore Panel and Character Setup HUD buttons
2021-08-01 03:25:38 +00:00
