962 Commits
Author SHA1 Message Date
MechoidandVirgoBot ea73111f61 Industrial Expansion 2021-01-27 23:30:50 -05:00
MechoidandVirgoBot 40d65d962f Department and Round Goals 2020-12-11 19:19:15 -05:00
izac112 d45fa0cdaf Update 2020-12-09 03:34:16 +01:00
izac112 c59c794ecc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-12-09 03:29:16 +01:00
NovacatandGitHub 162d018f97 Merge pull request #9431 from Very-Soft/abduct-u
Abductor Ship
2020-12-08 13:55:41 -05:00
VerySoft ff2fb7069e Abduct-u 2020-12-08 13:10:27 -05:00
Hatterhat 7ed50074aa polaris#7778 earlyport 2020-12-07 01:34:32 -06:00
izac112 5d64303087 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-11-17 16:26:30 +01:00
Detective Google 67513cb402 adds comfy little cabin pods 2020-10-30 14:54:12 -05:00
CyantimeandGitHub 64ff25f5a3 Update survey_vendor.dm 2020-10-28 03:30:47 -04:00
CyantimeandGitHub 9a3533c3f7 Update equipment_vendor.dm 2020-10-28 03:29:03 -04:00
VerkisterandGitHub 201e0eab4b Merge pull request #9207 from VOREStation/upstream-merge-7680
[MIRROR] Phoron bore utility improvements
2020-10-27 10:15:30 +02:00
VerkisterandGitHub da5752e857 Update equipment_vendor.dm 2020-10-18 16:10:47 +03:00
VerkisterandGitHub 7eb390e4df Update survey_vendor.dm 2020-10-18 16:01:23 +03:00
VerkisterandGitHub 70af289ffb Update equipment_vendor.dm 2020-10-18 15:17:26 +03:00
Meghan-RossiandVirgoBot de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04:00
CyantimeandVirgoBot f5a1bdbea2 Phoron bore utility improvements 2020-10-12 00:01:21 -04:00
izac112 03f0165bd3 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-29 05:56:00 +02:00
ShadowLarkens 3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
NovacatandGitHub 48db324343 Merge pull request #8922 from lbnesquik/Kot-minin-inducer
Add the inducer to mining & survey vendors.
2020-09-02 13:32:21 -04:00
AtermoneraandVirgoBot ca2ce6adea Merge pull request #7600 from lbnesquik/Kot-Scanner-ore
Reduce the ore scanner time from 10 to 2 seconds. Same as the mech one.
2020-08-31 23:54:19 -04:00
KatesandGitHub 07d92c80ba Update survey_vendor.dm 2020-08-31 22:52:34 +02:00
lbnesquik a78a04d7ad Add the inducer to mining & survey vendors.
They are relatively expensive so it is still better to bother competent R&D.
2020-08-30 21:27:14 +02:00
Unknown 5be8cac469 Some quick fixes
- Fixes pathing error for ship capsules
- Adds a decal to all capsules
- Updates the Military capsule a bit
- Fixes a pathing error in an underdark POI
2020-08-28 14:36:16 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
KatesandGitHub 8a138ee94e Add a zero to the translocator. 2020-08-22 22:48:32 +02:00
lbnesquik 472685cd25 Correct price errors introduced in UI update. Also shuffle a few things so there is no random spaces in the vendor. 2020-08-22 20:36:21 +02:00
izac112 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
VerkisterandGitHub 929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
NovacatandGitHub d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat
Adds Mech Toy Battles!
2020-08-21 01:14:42 -04:00
MechoidandVirgoBot 496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
ShadowLarkens 9cd0f5b086 Fix survey vendor 2020-08-16 22:27:53 -07:00
ShadowLarkens d769358194 TGUI Stacking Machine 2020-08-16 22:27:09 -07:00
ShadowLarkens 5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07:00
ShadowLarkens 510162d2d5 TGUI Mining Equipment Vendor 2020-08-16 22:27:08 -07:00
Rykka 5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Rykka a5fc9d81ce Adds Mech Toy Battles!
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
2020-08-12 04:31:00 -04:00
SplinterGP 9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
Repede 5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
Also readds vore monkeys
2020-07-26 12:48:22 -04:00
izac112 1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
NovacatandGitHub b611dcfac7 Update drill.dm 2020-06-28 12:38:46 -04:00
Aronai SieyesandVirgoBot 0625e2d6b1 Adds get_cell to drill heads so you can use an inducer on them 2020-06-28 03:33:48 -04:00
izac112 4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
AtermoneraandVirgoBot 69c3c8c98f mining drill and recharger find their shiny new cells 2020-06-13 06:57:09 -04:00
izac112 7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Unknown dd7cf8e56e Fixes Broken RIG in Crates 2020-06-07 16:42:16 -04:00
AtermoneraandVirgoBot 28e952806c Adds proc to replace default cells with high cap on machinery (#7241)
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
2020-06-04 22:38:39 -04:00
izac112 79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Aronai Sieyes 21a640ebd3 Adds get_cell to drill heads so you can use an inducer on them 2020-06-02 20:56:55 -04:00