cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 15:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,723 Commits 8 Branches 26 Tags
aa528264dd723a4e84055150efc4aa569ef23ebe
Commit Graph

35955 Commits

Author SHA1 Message Date
Arokha Sieyes
aa528264dd Add some vorestation-specific IPR things 2020-01-31 14:53:52 -05:00
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no 
Hacky Fix for Athletic Shorts showing Missing Icon
 2020-01-30 19:24:59 -05:00
Novacat
7a9f31a26a Merge pull request #6515 from TheFurryFeline/patch-18 
Redundant Warning Removed
 2020-01-30 02:09:59 -05:00
TheFurryFeline
301cae5994 Redundant Warning Removed 
Changelog Notes: 

- Removes the big, honking red text about archive being slated for removal. We're not removing entries from the database.
 2020-01-29 12:28:28 -05:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Novacat
75b8b621f9 Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs 
Add additional tools for Research Hound and Pupdozer - Upstream Port
 2020-01-26 16:38:37 -05:00
Novacat
f522a88378 Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model 
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
 2020-01-26 16:38:25 -05:00
Novacat
4505684fbd Merge pull request #6507 from VOREStation/upstream-merge-6603 
[MIRROR] Add an audible alarm sound to SM Delamination
 2020-01-25 23:04:14 -05:00
Novacat
c44268a96d Merge pull request #6506 from VOREStation/upstream-merge-6649 
[MIRROR] Fixes Bagel Poppy Recipe
 2020-01-25 22:56:34 -05:00
Novacat
2366e865f3 Update supermatter.dm 2020-01-25 22:56:18 -05:00
Atermonera
d5869f2c3f Add an audible alarm sound to SM Delamination 2020-01-25 22:25:49 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1 
Fixes Bagel Poppy Recipe
 2020-01-25 22:16:18 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
TheFurryFeline
0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
Novacat
4d2ec30fb9 Merge pull request #6499 from VOREStation/upstream-merge-6645 
[MIRROR] Adds book cart to library
 2020-01-24 00:55:57 -05:00
Novacat
44bad05eed Merge pull request #6501 from VOREStation/upstream-merge-6639 
[MIRROR] Preset (mapped-in) modular computers now have printers by default.
 2020-01-24 00:54:22 -05:00
Atermonera
ac208d171d Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 23:55:51 -05:00
Schnayy
8ebe8c8772 Adds book cart to library 2020-01-23 23:53:25 -05:00
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Novacat
2914cbf2ce Merge pull request #6497 from VOREStation/upstream-merge-6648 
[MIRROR] Fix Water Resistance.
 2020-01-23 17:40:31 -05:00
Novacat
37f2862660 Update species.dm 2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14 Fix Water Resistance. 2020-01-23 17:13:51 -05:00
Heroman
824637d6a4 _vr 2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff Removes prommies weakness to water entirely 2020-01-24 08:11:02 +10:00
Heroman
2ca6c5870a Earlyports fix for water killing everything 2020-01-24 07:59:24 +10:00
Rykka
433ecaf14d Add additional tools for Research Hound and Pupdozer - Upstream Port 
Adding features from the other borg modules over to the dogborg versions.

Pupdozer:

Air Analyzer
Pipe Painter
Floor Painter
Geiger Counter
Plasteel manipulator
Research Hound:

ID card to open other borg interfaces
Organ gripper
Mech part gripper
Robot Analyzer
Welding tool
Wrench
Wirecutters
Multitool
Nanopaste reserves
Wire reserves

Port from YW/Chompstation - https://github.com/Yawn-Wider/YWPolarisVore/pull/390
 2020-01-22 01:52:48 -07:00
Rykka
b43e7f9e71 Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port 
Adding "V2 Engidog" to Pupdozer list
Adding four modules to the Pupdozer module: Air Analyzer, Sheet Loader, Magnetic Gripper, Pipe Painter and Floor Painter.

Port from YW/ChompStation
 2020-01-22 01:46:51 -07:00
Novacat
3d0b07a154 Merge pull request #6485 from VOREStation/upstream-merge-6630 
[MIRROR] IP reputation checking
 2020-01-21 19:13:19 -05:00
Novacat
2b8ad79db8 Merge pull request #6486 from VOREStation/upstream-merge-6638 
[MIRROR] Drops the time between events possible duration.
 2020-01-21 18:59:23 -05:00
Novacat
b0b60d051e Update client procs.dm 2020-01-21 18:56:54 -05:00
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
Atermonera
c0e64d5126 Merge pull request #6638 from Mechoid/BumpGameMasterTime 
Drops the time between events possible duration.
 2020-01-21 18:12:47 -05:00
Atermonera
44d334a37c IP reputation checking 2020-01-21 18:11:29 -05:00
Novacat
9e0e860f4e Merge pull request #6454 from VOREStation/discoban 
Ban/unban, note/unnote, kick to webhook
 2020-01-21 01:46:53 -05:00
Novacat
0679ed4042 Merge pull request #6481 from VOREStation/upstream-merge-6632 
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
 2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00
Novacat
5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628 
[MIRROR] Adds a mega cooking recipe
 2020-01-21 01:26:48 -05:00
Novacat
1ee5865327 Merge pull request #6477 from Rykka-Stormheart/shep-dev-earlyport-mech-fixes 
Earlyport mech fixes, fix Polecat armor issues
 2020-01-21 01:25:44 -05:00
Unknown
f163a60eed Updoot 2020-01-21 01:24:28 -05:00
Novacat
7b815bd594 Update radio.dm 2020-01-21 01:23:57 -05:00
Novacat
d7e919c66f Merge pull request #6482 from VOREStation/upstream-merge-6636 
[MIRROR] Fix various syntactic problems
 2020-01-21 01:23:04 -05:00
Novacat
1b12757e28 Update scrubber.dm 2020-01-21 01:17:21 -05:00
Novacat
bd06a75f81 Update cargo_train.dm 2020-01-21 01:16:43 -05:00
Novacat
d9ada5bc0e Update scrubber.dm 2020-01-21 01:16:11 -05:00
Novacat
18963d3714 Update Sleeper.dm 2020-01-21 01:15:30 -05:00
Novacat
c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
Novacat
59ef7b48cf Update retail_scanner.dm 2020-01-21 01:12:12 -05:00