cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,272 Commits 8 Branches 26 Tags
f5990cfe35f4ce3c82bcdbbebbf848986e672664
Commit Graph

24749 Commits

Author SHA1 Message Date
Little-119
f5990cfe35 Fix cooldown math while I'm here 2020-05-06 17:50:54 -04:00
Little-119
6f9f3cd897 Add nightshift setting 2020-05-06 17:50:18 -04:00
Aronai Sieyes
586dcad6a1 Merge pull request #7655 from VOREStation/aro-doingafter 
Make some progress bar activities exclusive
 2020-05-05 19:47:08 -04:00
Aronai Sieyes
c9f67a2396 Merge pull request #7656 from VOREStation/upstream-merge-7060 
[MIRROR] Ling Fixes + Various other fixes
 2020-05-05 19:46:57 -04:00
Aronai Sieyes
dd9a463601 Merge pull request #7658 from VOREStation/upstream-merge-7072 
[MIRROR] Fix Broken Gun Examining
 2020-05-05 19:21:20 -04:00
Aronai Sieyes
0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Atermonera
34a2d38f3b Merge pull request #7077 from Mechoid/KururakTweaks 
Kururaks now (theoretically) are not as agonizing to fight.
 2020-05-05 17:18:03 -04:00
Atermonera
76177da0f9 Merge pull request #7072 from Mechoid/BrokenGunExamine 
Fix Broken Gun Examining
 2020-05-05 17:09:57 -04:00
Atermonera
284a0b4d80 Ling Fixes + Various other fixes 2020-05-05 17:02:27 -04:00
Aronai Sieyes
c5e8685593 Port Paradise progress bars 2020-05-05 16:51:05 -04:00
Aronai Sieyes
7560ff2c5a Merge pull request #7644 from TeleTubby2/bazingabeamnatje 
Adds Natje's Curabitur Cannon
 2020-05-05 13:11:38 -04:00
Aronai Sieyes
e76cd40756 Merge pull request #7646 from VOREStation/aro-hydroclick 
Prevent ghosts/others from messing with hydrotrays
 2020-05-05 13:11:13 -04:00
Aronai Sieyes
1af099ec22 Merge pull request #7647 from VOREStation/aro-bsharpoon 
Bluespace Harpoon Tweaks
 2020-05-05 13:11:05 -04:00
Aronai Sieyes
f497815fa4 Merge pull request #7648 from VOREStation/aro-rndconsole 
Update R&D Console, Autolathes
 2020-05-05 13:10:59 -04:00
Aronai Sieyes
e8cae15ed8 Don't show borgs alarms not local to them 2020-05-05 12:31:29 -04:00
Teletubby2
709619fc9a Back sprite. fixes. 
rusty boooys
 2020-05-05 11:26:10 -04:00
Aronai Sieyes
b83e893637 Add filter/search to protolathe and circuit designs 2020-05-05 10:41:12 -04:00
Aronai Sieyes
3179b741c0 Update R&D Console 2020-05-05 10:12:24 -04:00
Aronai Sieyes
1fb36dbcaf Bluespace Harpoon Tweaks 
Random failure is lame, but so is removing gameplay.
 2020-05-05 09:56:49 -04:00
Aronai Sieyes
e3bf07f90f Prevent ghosts/others from messing with hydrotrays 2020-05-05 09:11:05 -04:00
Teletubby2
feb2f7da36 adds Natje's bazinga beam 
I forgot how much gun code sucked.
 2020-05-05 06:37:18 -04:00
Aronai Sieyes
5556588dbd Merge pull request #7642 from VOREStation/aro-facesits 
Reword grab facesits
 2020-05-04 23:32:50 -04:00
Aronai Sieyes
72511b9fa7 Rewords grab facesits 
Let's be real here. It's facesits.
 2020-05-04 23:21:46 -04:00
Aronai Sieyes
5134f60956 Merge pull request #7639 from VOREStation/aro-penspam 
Add cooldown to pen clicks
 2020-05-04 23:18:53 -04:00
Aronai Sieyes
8216144ab9 Add cooldown to pen clicks 
Fixes https://github.com/VOREStation/VOREStation/issues/7000
 2020-05-04 23:06:38 -04:00
Aronai Sieyes
ad9cdaade6 Merge pull request #7637 from VOREStation/aro-shake 
Fix protein shaker name
 2020-05-04 21:12:09 -04:00
Aronai Sieyes
08c371e271 Merge pull request #7636 from VOREStation/aro-condi 
Fix condiment container infinite range
 2020-05-04 21:05:28 -04:00
Aronai Sieyes
1978246176 Merge pull request #7633 from VOREStation/aro-roles 
Add prefs for Be Morph, Be Maintpred, Be Lost Drone
 2020-05-04 21:05:14 -04:00
Aronai Sieyes
3c66e23442 Merge pull request #7631 from VOREStation/aro-fix7601 
Fixes #7601
 2020-05-04 21:04:50 -04:00
Aronai Sieyes
ff5bf6569e Merge pull request #7552 from ShadowLarkens/vore_refactor_mk2 
Vore refactor V2
 2020-05-04 21:04:20 -04:00
Aronai Sieyes
fa13c1089f Fix protein shaker name 2020-05-04 21:01:06 -04:00
Aronai Sieyes
19450573fe Fix condiment container infinite range 2020-05-04 20:24:54 -04:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone 
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b Fix out-of-order role candidate options 
fixup pol commit
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
3e45398a1d Fixes #7601 2020-05-04 18:19:46 -04:00
Aronai Sieyes
e24410ccce Merge pull request #7622 from VOREStation/aro-vitals 
Port Bay vitals monitors
 2020-05-04 16:49:52 -04:00
Cyantime
fe8878985b Allows dogborg barks to be disabled 2020-05-04 16:16:56 -04:00
Aronai Sieyes
aa17a98c77 Merge pull request #7626 from VOREStation/aro-ships 
Update ships, add ATTRIBUTIONS.md
 2020-05-04 14:49:06 -04:00
Aronai Sieyes
fabbdd8c8d Update ships, add ATTRIBUTIONS.md 2020-05-04 14:27:46 -04:00
Leshana
f93d50b034 Fix an overcharged smes from breaking charging on other smes. 
An overcharged smes could demand negative power from the grid, swamping other SMES and resulting in zero power being distributed.
 2020-05-04 13:36:53 -04:00
Aronai Sieyes
d8802c844c Merge pull request #7620 from VOREStation/aro-apcnight 
Allow locked APCs to still toggle night lighting
 2020-05-03 22:24:40 -04:00
Aronai Sieyes
9ecbb2feb1 Merge pull request #7619 from storesund98/master 
Aurora's floof, I mean fluff item
 2020-05-03 22:24:28 -04:00
Aronai Sieyes
216873f12d Port Bay vitals monitors 2020-05-03 22:18:19 -04:00
Aronai Sieyes
f270f276bc Allow locked APCs to still toggle night lighting 2020-05-03 21:13:17 -04:00
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
Aronai Sieyes
47d81e83b2 Merge pull request #7614 from VOREStation/aro-ssnightshift 
Port SSnightshift from Paradise
 2020-05-03 19:00:32 -04:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing 
Ports over power-related enhancements and tweaks i coded for Bay a while back
 2020-05-03 18:45:25 -04:00
Aronai Sieyes
aa6d22097b Port SSnightshift from Paradise 
Makes the station have a night mode.
 2020-05-03 17:51:05 -04:00
Aronai Sieyes
e8d1c964f3 Time datum fixes 2020-05-03 17:49:55 -04:00
Novacat
634b8e1ea8 Merge pull request #7607 from VOREStation/aro-slemfix 
Fix Xenobio Slimes
 2020-05-03 13:11:43 -04:00