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
Razgriz
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07: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
izac112
4864ad384d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-17 04:30:06 +02:00
Atermonera
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
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
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
Aronai Sieyes
719151a74a
Port Bay's lockers, crates, largecrates, wall lockers
2020-05-31 12:26:00 -04:00
izac112
e807b80281
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-27 20:10:55 +02: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
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
Aronai Sieyes
264a8340c1
Can map in cell'd mining drills using the /loaded subtype
2020-05-21 11:31:00 -04:00
Razgriz
fb98ba3471
Update mine_turfs.dm
2020-05-21 03:42:03 -07:00
Razgriz
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
izac112
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
Razgriz
5e8aa0b124
Merge pull request #343 from Rykka-Stormheart/shep-dev-pawsteps!
...
Earlyport of Footstep sounds properly working!
2020-05-10 14:26:27 -07:00
Rykka
d01c717b9b
Comments out upstream stuff, will be uncommented out during upstream merge
2020-05-09 18:39:27 -04:00
Rykka
160ac0f3d7
Earlyport of Footstep sounds properly working!
...
Removes the `New()` and `Initialize()` workarounds, fixes footstep sounds globally. All sounds and values have been tweaked carefully to match Chomper files, if there's any failures and/or issues, I will work to correct them. This is an EARLYPORT of https://github.com/VOREStation/VOREStation/pull/7737
2020-05-09 18:30:43 -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
Razgriz
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07:00
Atermonera
9c32a0e2b3
Updates machines to use default_apply_parts()
2020-05-07 00:40:34 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02: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
