Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Unknown
fb61850896
Mining/Explorer Tweaks
...
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
2019-08-01 16:25:58 -04:00
Hawk_v3
2a73ca4304
Merge remote-tracking branch 'upstream/master'
2019-07-23 22:51:24 +01:00
Atermonera and VirgoBot
1abe267189
Merge pull request #6314 from Nalarac/patch-1
...
Corrects Mining Vendor Entries
2019-07-22 00:42:53 -04:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Novacat and GitHub
d48861c7e3
Merge pull request #5469 from VOREStation/upstream-merge-6245
...
[MIRROR] The great rock update.
2019-07-14 01:36:40 -04:00
Novacat and GitHub
d120748a38
Update equipment_vendor.dm
2019-07-13 22:59:47 -04:00
Atermonera and VirgoBot
22c5967269
The great rock update.
2019-07-13 18:21:45 -04:00
Atermonera and VirgoBot
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Hawk_v3
daf005399d
Merge remote-tracking branch 'server/master'
2019-07-07 19:37:13 +01:00
MASMC
31543fc0d3
Oops, only did smacking with a rock, not satchels too
2019-07-07 13:50:21 -04:00
Hawk_v3
124afe1cbc
Merge remote-tracking branch 'upstream/master'
2019-07-07 18:41:28 +01:00
MASMC
d682ecacfa
Fixes ore boxes picking up strange rocks
...
Simple name check fix. Nothing should fill up, as the rock "bounces" out
of the crate. Enjoy.
2019-07-06 18:40:42 -04:00
Heroman
c8d9bce55d
Allows to compress coal into carbon sheets
2019-07-07 08:01:31 +10:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Heroman
d0b9ab620a
Adds mining GPS to mining vendor
2019-07-02 12:08:05 +10:00
Novacat and GitHub
9ac9317657
Merge pull request #5320 from Ketrai/fishingrod
...
Adds a durasteel fishing rod.
2019-06-18 17:50:55 -04:00
Hawk_v3
c7b05c05fb
Merge remote-tracking branch 'upstream/master'
2019-06-11 02:34:25 +01:00
Neerti and VirgoBot
4512cd7b18
Merge pull request #6200 from Heroman3003/xenoarch-fixes
...
Fixes some xenoarch bugs
2019-06-09 11:47:07 -04:00
Ketrai
cea411049a
Adds a durasteel fishing rod.
2019-06-07 16:48:35 +02:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Atermonera and VirgoBot
4cde759fac
Merge pull request #6175 from Heroman3003/braceself
...
Fixed mining drill brace deconstruction issue
2019-05-28 13:11:27 -04:00
Hawk_v3
470c86fb45
Merge remote-tracking branch 'upstream/master'
2019-05-08 19:59:55 +01:00
Unknown
31d7663bf1
Conflict Resolution
2019-05-06 14:32:18 -04:00
Novacat and GitHub
b4b5ca1eaf
Update equipment_vendor.dm
2019-05-06 14:24:40 -04:00
Atermonera and VirgoBot
90ee680dd5
Fishing!
2019-05-06 14:16:27 -04:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Heroman
9d234f39ad
Adds a bunch new PoIs to Underdark
2019-04-30 08:20:42 +10:00
Heroman
1b87b38c4a
More PoIs
2019-04-30 05:39:42 +10:00
Novacat and GitHub
cd022ca990
Merge pull request #5113 from Heroman3003/ka-holsters
...
Adds KA holster to mining vendor
2019-04-24 01:27:58 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Atermonera and VirgoBot
eff39e3366
Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev
...
Marble ore [Exists] again.
2019-04-22 14:30:03 -04:00
Neerti and VirgoBot
2ffe390346
Merge pull request #6116 from Mechoid/WhyAmIStupid
...
God damnit past me.
2019-04-22 00:27:50 -04:00
Heroman
fef914b3bd
Adds KA holster to mining vendor
2019-04-22 06:47:55 +10:00
Neerti and VirgoBot
3b2c4c5271
Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever
...
Fixes runtiming with mineral turfs
2019-04-14 19:56:33 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Neerti and VirgoBot
6441d365df
Merge pull request #6080 from Mechoid/FixAccidentalAlchemy
...
Fixes My Idiocy
2019-04-14 02:48:40 -04:00
Neerti and VirgoBot
fc7c6f38b4
Base features for Precursotech and Anomalotech Expansion
2019-04-13 22:44:52 -04:00
Heroman3003
b240e8d60d
Fixes flags anchoring themselves wrong way
2019-04-08 10:34:21 +10:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Heroman
09b5ae0ac4
AND REMOVES THEM FROM NORMAL ONES
2019-04-08 07:38:22 +10:00
Heroman
f955d69bd9
Moves destroy_artefact vars to _vr file
2019-04-08 07:37:48 +10:00
Heroman
7d828a7777
Makes Sonic Jackhammer a 'safe' mining tool
2019-04-08 07:27:02 +10:00
Heroman
44780295c9
Fixes tiny fans blocking people and not blocking atmos
2019-04-07 11:14:31 +10:00
Novacat and GitHub
1519496d9f
Merge pull request #4849 from VOREStation/upstream-merge-5978
...
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
Neerti and Novacat
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Neerti and Novacat
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
Neerti and Novacat
b9adc37685
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
Neerti and Novacat
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Hawk_v3