Commit Graph

632 Commits

Author SHA1 Message Date
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 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
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