Commit Graph

656 Commits

Author SHA1 Message Date
Aronai Sieyes
27b9451181 VS: Kwargs fixes 2021-05-27 12:10:22 -04:00
Aronai Sieyes
7d725e740b VS: Implicit list abuse 2021-05-27 12:08:51 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Atermonera
bf07cddb6d Merge pull request #8074 from Atermonera/unmap_tin
Removes tin for ore generation
2021-05-23 15:40:02 -04:00
Aronai Sieyes
4e1308d48c Add mapping units/beacons for explo 2021-05-22 17:13:43 -04:00
Killian
5068041b8f Merge branch 'master' into kk-ships2 2021-05-10 17:42:03 +01:00
Aronai Sieyes
c4610a858d Move ore lists to global lists 2021-05-10 12:13:39 -04:00
Killian
7238f3917e Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-09 20:19:20 +01:00
Killian
9f156e2e7d 1Z Talon - R2.0
banished 2z talon to the deprecated folder (begone ~~thot~~ block), fixed the refinery with a couple of hacks (now processes ore, doesn't give points!), and adjusted the custom spawners in cargo
2021-05-09 20:17:58 +01:00
Novacat
d9937399de Merge pull request #10192 from VOREStation/upstream-merge-8022
[MIRROR] Moves material stacks to modules/materials
2021-04-28 12:38:07 -04:00
Atermonera
52889d1262 Makes mineral turf ore list static (#8044) 2021-04-27 17:23:26 -04:00
Unknown
c1eeea9efc Exploration Balance Tweaks
- Removes the Pathfinder's Frontier Carbine
- Removes the Pathfinder's Binoculars
- Adds the Frontier Carbine to the Survery Vendor, for 750 points. It has improved stats over a normal Frontier Phaser
- Adds binoculars to the survey vendor for 40 points
- Adds a Frontier Rifle, adminbus only for now
- Renames some frontier phaser sprites for additional clarity
- Adds two frontier holdout phasers to the exploration weapons locker
2021-04-26 14:03:40 -04:00
Atermonera
d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
Unknown
86ab88d5f0 Updates some atoms 2021-04-15 18:46:11 -04:00
Hatterhat
3b678d8c65 lets not make slag kkthx 2021-03-24 16:39:29 -05:00
Unknown
d8305caaeb Fixes ore deposits having icon error 2021-03-11 20:48:27 -05:00
Atermonera
6db2020015 Merge pull request #7964 from Shadow-Quill/Cell-Fixing
Taking cell out of a standing drill now attempts to put it in your hands.
2021-03-10 14:20:14 -05:00
Atermonera
26be40158e Merge pull request #7955 from FenodyreeAv/MiningScanner
Adds an advanced version of the mining drill scanner.
2021-03-10 13:59:00 -05:00
Novacat
8859e80f62 Merge pull request #9870 from VOREStation/upstream-merge-7937
[MIRROR] The Deep Scan Device
2021-03-09 19:02:40 -05:00
Novacat
7fcb6e2f1a Update mine_turfs.dm 2021-03-09 15:55:46 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00
Atermonera
3797ec6036 Merge pull request #7948 from Meghan-Rossi/stacker_fix
Fix stacking machine not stacking most materials
2021-03-07 16:20:54 -05:00
klaasjared
51a0ab5e37 The Deep Scan Device 2021-03-07 16:02:38 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat
bcaf7dcdff Merge pull request #9445 from VOREStation/upstream-merge-7369
[MIRROR] Department and Round Goals
2021-02-21 17:14:47 -05:00
Novacat
e3a19bb2ea Update ore.dm 2021-02-21 09:39:26 -05:00
Novacat
13c59371c9 Porting Fixes 2021-02-20 02:08:18 -05:00
Unknown
474794a2ff Fix Bugs
- Adds return to Ore New()
- Fixes wrong typepath for Merc thermals
2021-02-15 16:52:09 -05:00
Mechoid
ea73111f61 Industrial Expansion 2021-01-27 23:30:50 -05:00
Mechoid
40d65d962f Department and Round Goals 2020-12-11 19:19:15 -05:00
Novacat
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
Detective Google
67513cb402 adds comfy little cabin pods 2020-10-30 14:54:12 -05:00
Cyantime
64ff25f5a3 Update survey_vendor.dm 2020-10-28 03:30:47 -04:00
Cyantime
9a3533c3f7 Update equipment_vendor.dm 2020-10-28 03:29:03 -04:00
Verkister
201e0eab4b Merge pull request #9207 from VOREStation/upstream-merge-7680
[MIRROR] Phoron bore utility improvements
2020-10-27 10:15:30 +02:00
Verkister
da5752e857 Update equipment_vendor.dm 2020-10-18 16:10:47 +03:00
Verkister
7eb390e4df Update survey_vendor.dm 2020-10-18 16:01:23 +03:00
Verkister
70af289ffb Update equipment_vendor.dm 2020-10-18 15:17:26 +03:00
Meghan-Rossi
de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04:00
Cyantime
f5a1bdbea2 Phoron bore utility improvements 2020-10-12 00:01:21 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07: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