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
45,835 Commits 8 Branches 26 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

22192 Commits

Author SHA1 Message Date
Aronai Sieyes
382c6b5152 VS edit merge 2018-10-20 17:28:24 -04:00
Unknown
c674f13de4 Nerfs Cash from Mining Vendor 
The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.
 2018-10-20 14:50:43 -04:00
Spades
dbec51db41 Merge pull request #4433 from Verkister/infixfix 
Fixes examine for mobs that relied on atom proc specific features.
 2018-10-20 08:58:05 -04:00
Spades
79d5ece0b3 Merge pull request #4430 from VOREStation/upstream-merge-5690 
[MIRROR] Fix wax appearing to be steel.
 2018-10-20 08:57:38 -04:00
Spades
87210df046 Merge pull request #4428 from VOREStation/upstream-merge-5667 
[MIRROR] Bring back the traitor panel verb.
 2018-10-20 08:56:39 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Spades
6d3b8812f5 Merge pull request #4344 from Novacat/nova-heterochromia 
Reverts species settings
 2018-10-20 08:52:05 -04:00
Verkister
81fa928d4c Fixes examine for mobs that relied on atom proc features. 
-Mainly affected borgs and pAIs. Maybe others idk.
 2018-10-20 14:47:39 +03:00
Neerti
e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
Neerti
ea6a9f2df5 Merge pull request #5690 from lbnesquik/Kates-Wax-Fix 
Fix wax appearing to be steel.
 2018-10-20 00:07:01 -04:00
Neerti
360103a487 More paths to Quick_Create 2018-10-20 00:05:48 -04:00
Neerti
e46506adf7 Merge pull request #5667 from lbnesquik/Kates-Admin-Tweak² 
Bring back the traitor panel verb.
 2018-10-20 00:05:37 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Sebbe9123
df23ae9891 Adds toggle for secpatch 
You can now toggle and switch what eye the secpatch covers for all your partial blindness needs.
 2018-10-18 11:27:04 +02:00
Spades
ea12d3d18c Merge pull request #4328 from lbnesquik/Kates-Citborg-Port 
Dogborgs start with full water reserves.
 2018-10-17 17:28:51 -04:00
Unknown
3a510e9779 Tweaks contents a bit more 2018-10-16 22:19:46 -04:00
Neerti
972777fd94 Adds Mods/Dev perms to ticket permission checks (#5683) 2018-10-16 18:28:14 -04:00
Unknown
6dc9e56a44 Shelter Capsule Content Tweaks 
- Adds some more synth batteries to both capsules
- Removed the Adv first aid kit from the table
- Adds a Basic/Adv/O2/Fire/Toxin kit to luxury storage
- Removes the violin due to being a source of grief
- Changes the bag of dice to a bag of gaming dice
- Luxury capsule now has twice the amount of MREs

The main reasons for this PR:
- Removes shelter capsules as a source of violins, which have been involved in a few... incidents
- Equals the amount of batteries to the amount of liquid foods in the basic capsule, so that synth crew are not required to push for the luxury capsule and its recharger
- Adds a toxin kit to shelter capsules, since toxins are a bigger issue in the phoron-based atmosphere of V2
- Provides a health analyzer to the shelter capsule, the omission of which was very strange.

Rest of the kits were added just for completion sake. All of the ones included be obtained from cargo for a single ten point crate, so the effects on balance will be minimal.
 2018-10-16 17:27:35 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Unknown
d91b8af845 Requested Changes 3 2018-10-16 14:04:05 -04:00
Aronai Sieyes
8c764d487d Merge pull request #4340 from Novacat/nova-pathfinder 
Exploration Fixes for 09-27-2018 Sync
 2018-10-16 12:27:52 -04:00
Aronai Sieyes
ce0450e218 Merge pull request #4399 from VOREStation/upstream-merge-5666 
[MIRROR] Magazines improvements
 2018-10-16 12:19:06 -04:00
Aronai Sieyes
3b2d47087f Merge pull request #4397 from VOREStation/upstream-merge-5671 
[MIRROR] Prevent people from removing papers from any distances.
 2018-10-16 12:18:55 -04:00
Aronai Sieyes
872eff5004 Merge pull request #4395 from VOREStation/upstream-merge-5670 
[MIRROR] Fix a couple of ticket bugs
 2018-10-16 12:18:46 -04:00
Aronai Sieyes
d66c8e326b Merge pull request #4394 from VOREStation/upstream-merge-5652 
[MIRROR] Fixes missing sprites when excavating rocks
 2018-10-16 12:18:35 -04:00
Aronai Sieyes
fac9a2c121 Merge pull request #4393 from VOREStation/upstream-merge-5647 
[MIRROR] Add a noise for mining scanners.
 2018-10-16 12:18:14 -04:00
Aronai Sieyes
78bd63d568 Merge pull request #4392 from VOREStation/upstream-merge-5626 
[MIRROR] Move almost everything food related into the kitchen module.
 2018-10-16 12:18:05 -04:00
Aronai Sieyes
9dc2f288a0 Clean up two-way merge 2018-10-16 12:08:31 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00
Spades
5b755d757a Merge pull request #4396 from VOREStation/upstream-merge-5674 
[MIRROR] Removes maintenance access from cleanbots
 2018-10-15 17:32:14 -04:00
Kates
26089f3a72 Magazines improvements 2018-10-15 15:52:56 -04:00
Anewbe
935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs 
Stop usage of multiple vision modifiers
 2018-10-15 15:51:43 -04:00
Anewbe
34ee689609 Merge pull request #5671 from lbnesquik/Kates-Fax-Fix 
Prevent people from removing papers from any distances.
 2018-10-15 15:51:30 -04:00
Anewbe
8ccd796753 Merge pull request #5674 from Nalarac/patch-1 
Removes maintenance access from cleanbots
 2018-10-15 15:50:13 -04:00
Anewbe
6e5a5f5edc Fix a couple of ticket bugs 2018-10-15 15:49:58 -04:00
Anewbe
6bf9647ff7 Merge pull request #5652 from Cerebulon/excavation_sprite 
Fixes missing sprites when excavating rocks
 2018-10-15 15:48:42 -04:00
Anewbe
8fc3cdfb3e Merge pull request #5647 from lbnesquik/Kates-Mining-Tweak 
Add a noise for mining scanners.
 2018-10-15 15:48:30 -04:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00
lbnesquik
d8fd7ea6ac Update to listen to the reviews 2018-10-15 16:34:55 +02:00
Anewbe
51a493427d Graves (#5622) 
* Adds support for closets storing closets, and graves

* More Grave Things
 2018-10-13 17:58:48 -04:00
Aronai Sieyes
20c44e4cf0 Merge pull request #4370 from VOREStation/upstream-merge-5655 
[MIRROR] Wax can stacxk
 2018-10-13 17:39:30 -04:00
Aronai Sieyes
01539b5468 Merge pull request #4368 from VOREStation/upstream-merge-5648 
[MIRROR] Prevents people from HREF exploiting around the R&D console lock.
 2018-10-13 17:29:47 -04:00
Atermonera
a74ec39eed Merge pull request #5655 from lbnesquik/Kates-Wax-Fix 
Wax can stacxk
 2018-10-13 17:16:14 -04:00
Atermonera
dde25a46f0 Merge pull request #5648 from king5327/polarissciconfix 
Prevents people from HREF exploiting around the R&D console lock.
 2018-10-13 17:14:48 -04:00
Atermonera
54a24d244f Merge pull request #5657 from lbnesquik/Kates-Cap-Fix 
Move surgery caps into their own selection.
 2018-10-13 17:13:32 -04:00
lbnesquik
56ff73f57c Makes water related changes shorter. 2018-10-13 09:40:35 +02:00
lbnesquik
cb501e395d Please review 2018-10-13 09:28:27 +02:00
Arokha Sieyes
5fe59a1f2a Critical maploader fix 
Definitely do not update the server without this change.
And a gateway tweak thing because that was my original intent with this branch.
 2018-10-13 01:36:26 -04:00
Aronai Sieyes
5f10bf5444 Merge pull request #4352 from Screemonster/prommiecoreicons 
gives prommie cores an icon
 2018-10-12 21:35:00 -04:00
Unknown
27724a697a Removes recharging high capacity 
Not really motivated to make a new icon.... This is not used anywhere anyway.
 2018-10-12 21:19:31 -04:00