cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-07 16:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,948 Commits 7 Branches 0 Tags
949daef5b16e9155eba9a4ffebb5ac7639faa98d
Commit Graph

45444 Commits

Author SHA1 Message Date
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
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
Razgriz
eea7fd0a87 Merge pull request #2753 from CHOMPStationBot/upstream-merge-11364 
[MIRROR] Fixes #11352
 2021-08-08 01:06:02 -07:00
Razgriz
1e8a59e771 Merge pull request #2754 from lbnesquik/Kot-nif-sound 
Reduces the sound volume of the NIF as to not blow your ears out
 2021-08-08 01:04:54 -07:00
lbnesquik
a46299b83a Reduces the sound volume of the NIF as to not blow your ears out 2021-08-08 09:11:03 +02:00
Aronai Sieyes
5183b0fa73 Merge pull request #11364 from VOREStation/Fixes/11352 
Fixes #11352
 2021-08-08 01:39:43 +00:00
Razgriz
0e85502021 Merge pull request #2747 from CHOMPStation2/Razgriz1032-patch-8 
Fix being unable to put micros in shoes
 2021-08-07 16:49:43 -07:00
Razgriz
eec07621d3 Merge pull request #2749 from CHOMPStationBot/upstream-merge-11359 
[MIRROR] Fix SSthrowing bug
 2021-08-07 16:35:19 -07:00
Razgriz
347cd60a7f powder that makes you say yes 2021-08-07 16:33:22 -07:00
Razgriz
c39526423d Merge pull request #2740 from CHOMPStationBot/upstream-merge-11347 
[MIRROR] Phoron Bore - Adds Hefty Recoil When Firing
 2021-08-07 15:15:51 -07:00
Razgriz
40278c3bcd Merge pull request #2741 from CHOMPStationBot/upstream-merge-11341 
[MIRROR] Fancy sprited shuttles
 2021-08-07 15:13:48 -07:00
Razgriz
391853b436 Merge pull request #2742 from CHOMPStationBot/upstream-merge-11343 
[MIRROR] Port Eris maint drone as option
 2021-08-07 15:13:28 -07:00
Aronai Sieyes
eb13ece148 Merge pull request #11356 from VOREStation/Arokha/sipp 
Allows sipping proteans/prometheans
 2021-08-07 21:33:48 +00:00
Aronai Sieyes
edba839e1c Merge pull request #11359 from VOREStation/Arokha/fixthrow 
Fix SSthrowing bug
 2021-08-07 21:33:38 +00:00
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
fccca84940 Merge pull request #2733 from CHOMPStationBot/upstream-merge-11348 
[MIRROR] Port/add throwing subsystem
 2021-08-06 23:11:49 -07:00
Razgriz
5076b12d2a Fix being unable to put micros in shoes 
Thanks to TheGreatKitsune for this fix.
 2021-08-06 22:49:28 -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
5eacec4043 Merge pull request #2736 from CHOMPStationBot/upstream-merge-11336 
[MIRROR] Skyrat extinguisher cabinet sprites
 2021-08-06 22:30:34 -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
Razgriz
7c9eadefcb Merge pull request #2732 from CHOMPStationBot/upstream-merge-11350 
[MIRROR] Fixes #11061
 2021-08-06 22:29:30 -07:00
Razgriz
e3c2bfe5f6 Add quick auth nif to this admin verbs _vr 2021-08-06 21:48:57 -07:00
Aronai Sieyes
846f4e42d1 Merge pull request #11355 from GhostActual/fixitfixitfixit 
Fix for Issue #11354
 2021-08-06 22:16:01 +00:00
Chompstation Bot
6731e90dae Port Eris maint drone as option 2021-08-06 22:15:57 +00:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
b2fb505121 Merge pull request #11347 from ResidentCody/phoron-bore-shoots-slower 
Phoron Bore - Adds Hefty Recoil When Firing
 2021-08-06 22:14:42 +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
Chompstation Bot
b2b980c371 New Floor Tanks 2021-08-06 15:38:14 +00:00
Aronai Sieyes
a66ac79179 Merge pull request #11336 from VOREStation/Icons/skyratexting 
Skyrat extinguisher cabinet sprites
 2021-08-06 15:36:06 +00: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
Chompstation Bot
5043e01b85 Port/add throwing subsystem 2021-08-06 15:01:16 +00:00
Novacat
30f4f6dafb Merge pull request #11350 from VOREStation/Fixes/11061 
Fixes #11061
 2021-08-06 15:00:09 +00:00
Aronai Sieyes
530c13bbbc Merge pull request #11345 from VOREStation/Arokha/removestub 
Remove pointless /Crossed stub
 2021-08-06 14:51:53 +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
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