cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,205 Commits 6 Branches 0 Tags
72f5e790db6f994d4fdba109e1b9616f7e3f9f98
Commit Graph

784 Commits

Author SHA1 Message Date
Novacat
da6ed35551 Merge pull request #10012 from Hatterhat/rutile-moment 
using rutile in alloys no longer makes slag
 2021-03-26 13:46:33 +00:00
Nadyr
8e4da6b044 Merge pull request #1591 from CHOMPStationBot/upstream-merge-9922 
[MIRROR] Fixes Ore deposits having icon error
 2021-03-12 00:13:22 -05:00
Nadyr
62e293b890 Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894 
[MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.
 2021-03-12 00:05:38 -05:00
Novacat
d17efab021 Merge pull request #9922 from Novacat/nova-basicfixes 
Fixes Ore deposits having icon error
 2021-03-12 01:59:10 +00:00
Novacat
24a9d22855 Merge pull request #9898 from VOREStation/upstream-merge-7964 
[MIRROR] Taking cell out of a standing drill now attempts to put it in your hands.
 2021-03-10 19:30:10 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Nadyr
9d19cb12e0 Merge pull request #1547 from CHOMPStationBot/upstream-merge-9870 
[MIRROR] [MIRROR] The Deep Scan Device
 2021-03-10 01:45:55 -05:00
Nadyr
3e60113ea0 Update mine_turfs.dm 2021-03-10 00:33:43 -05:00
Novacat
9478017c49 Merge pull request #9870 from VOREStation/upstream-merge-7937 
[MIRROR] The Deep Scan Device
 2021-03-10 00:02:58 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Nadyr
81c2f9dac9 Merge pull request #1510 from Holdelta/MiningAdditions 
Mining additions
 2021-03-07 22:09:06 -05:00
Novacat
0109cb82c3 Merge pull request #9874 from VOREStation/upstream-merge-7948 
[MIRROR] Fix stacking machine not stacking most materials
 2021-03-07 21:48:35 +00:00
Test Turtle
875c71f157 Adding and re-adding quality-of-life items to mining 
Given that we are to be more action-oriented, I believe that mining could do with a few small updates from more action-oriented servers.

- Adds larger ore satchels
- Adds(re-adds?) cooldown upgrades for kinetic accelerator
- Re-adds the diamond pickaxe
 2021-03-06 16:40:13 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
32312e22b6 Update ore.dm 2021-02-23 03:24:24 -07:00
Chompstation Bot
f55f171cdf [MIRROR] Porting Fixes 2021-02-21 16:02:54 +00:00
Nadyr
ac10917edb Merge pull request #975 from CHOMPStationBot/upstream-merge-9421 
[MIRROR] polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed
 2020-12-13 21:07:30 -05:00
Chompstation Bot
ae92942bde Abductor Ship 2020-12-08 18:56:09 +00:00
Nadyr
dcd5d5f8df Update mine_turfs.dm 2020-12-08 03:48:46 -05:00
Chompstation Bot
f80607ae84 polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed 2020-12-07 17:03:03 +00:00
Razgriz
c92d0d0148 Merge pull request #771 from CHOMPStationBot/upstream-merge-9260 
[MIRROR] Update phoron bore vender paths
 2020-10-28 21:14:21 -07:00
Verkister
9311af3423 Merge pull request #9260 from Cyantime/patch-3 
Update phoron bore vender paths
 2020-10-28 12:47:15 +00:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
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
Atermonera
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
Kates
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
Kates
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
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Mechoid
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
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07: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
BlackMajor
717a5fa049 aughe 2020-07-23 13:57:39 +12:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00