Commit Graph

613 Commits

Author SHA1 Message Date
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
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
Novacat
b611dcfac7 Update drill.dm 2020-06-28 12:38:46 -04:00
Aronai Sieyes
0625e2d6b1 Adds get_cell to drill heads so you can use an inducer on them 2020-06-28 03:33:48 -04:00
Atermonera
69c3c8c98f mining drill and recharger find their shiny new cells 2020-06-13 06:57:09 -04:00
Unknown
dd7cf8e56e Fixes Broken RIG in Crates 2020-06-07 16:42:16 -04:00
Atermonera
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
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
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
f4e981c80d Merge pull request #8031 from VOREStation/Arokha/drillcell2
Actually fix drill cells for real this time
2020-05-22 16:27:49 -04:00
KasparoVy
fd665ed938 Amend Nomenclature for Clarity & Consistency
Opted to leave the trait datum type and name for the sake of reference & mild humour.
2020-05-22 12:12:32 -04:00
Aronai Sieyes
448a210929 Actually fix drill cells for real this time 2020-05-22 09:57:46 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Rykka
3d5bb56f8f Add footstep sounds to almost every single tile.
Shuttle tiles, default floors are still "regular".
Lava, sand, water, grass, beach, mining turfs all have sounds playing now for each footstep. <3

Massive credit to @Arokha for helping me figure out the floor system and sitting through getting it put together. <3 <3 <3
2020-05-09 17:40:14 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Unknown
1df25602c3 Poncho for mining 2020-05-03 10:08:19 -04:00
Novacat
048d7ac1ee Update survey_vendor.dm 2020-05-01 14:26:18 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Atermonera
f4e155db8f Merge pull request #7051 from InterroLouis/master
Tweak to mining scanner
2020-04-30 23:17:19 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert
Overhauls First Aid Kits
2020-04-29 18:44:43 -04:00
Aronai Sieyes
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Aronai Sieyes
fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -04:00
Unknown
a6deb3078d Overhauls First Aid Kits
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
2020-04-26 13:38:28 -04:00
KasparoVy
eed070851e Enabled the Smelting of Plastitanium
Seems like an oversight - can make titanium (smelting rutile), titanium glass & plastitanium glass but not plastitanium.
2020-04-21 21:42:35 -04:00
Aronai Sieyes
ace05634f5 Merge pull request #7354 from VOREStation/aro-tweaks
Smol Fixes
2020-04-20 19:39:47 -04:00
Aronai Sieyes
e9f7a40600 Add points for rutile ore 2020-04-20 13:56:06 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Unknown
a5f62634be Adds additional safeties
Stops ships from being deployable on planet surfaces
2020-04-19 19:30:35 -04:00
Unknown
c322941953 Assault Dropship, NDV Daedalus, and more!
- Adds an adminbus archeotech military dropship
- Renames the cruiser to the NDV Daedalus
- Removes the Daedalus' Vault, replaces with a engine room consisting of four nuclear reactors. 800 kw safe output
- Replaces the hull material of the Daedalus with something destructable
- Thickens the frontal hull of the Daedalus
- Combines shelter_atoms.dm and shelter_atoms_vr.dm into shelter_atoms_vr.dm (Polaris never ported Shelter capsules from us)
- Moves shelters.dm to shelters_vr.dm
- Fixes scanner readout of the Escape Pod
2020-04-19 15:01:40 -04:00
Unknown
5d2186cafd Fixfix Travis 2020-04-17 09:27:31 -04:00