9ac9317657
Merge pull request #5320 from Ketrai/fishingrod
...
Adds a durasteel fishing rod.
2019-06-18 17:50:55 -04:00
c7b05c05fb
Merge remote-tracking branch 'upstream/master'
2019-06-11 02:34:25 +01:00
4512cd7b18
Merge pull request #6200 from Heroman3003/xenoarch-fixes
...
Fixes some xenoarch bugs
2019-06-09 11:47:07 -04:00
cea411049a
Adds a durasteel fishing rod.
2019-06-07 16:48:35 +02:00
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
4cde759fac
Merge pull request #6175 from Heroman3003/braceself
...
Fixed mining drill brace deconstruction issue
2019-05-28 13:11:27 -04:00
470c86fb45
Merge remote-tracking branch 'upstream/master'
2019-05-08 19:59:55 +01:00
31d7663bf1
Conflict Resolution
2019-05-06 14:32:18 -04:00
b4b5ca1eaf
Update equipment_vendor.dm
2019-05-06 14:24:40 -04:00
90ee680dd5
Fishing!
2019-05-06 14:16:27 -04:00
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
9d234f39ad
Adds a bunch new PoIs to Underdark
2019-04-30 08:20:42 +10:00
1b87b38c4a
More PoIs
2019-04-30 05:39:42 +10:00
cd022ca990
Merge pull request #5113 from Heroman3003/ka-holsters
...
Adds KA holster to mining vendor
2019-04-24 01:27:58 -04:00
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
eff39e3366
Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev
...
Marble ore [Exists] again.
2019-04-22 14:30:03 -04:00
2ffe390346
Merge pull request #6116 from Mechoid/WhyAmIStupid
...
God damnit past me.
2019-04-22 00:27:50 -04:00
fef914b3bd
Adds KA holster to mining vendor
2019-04-22 06:47:55 +10:00
3b2c4c5271
Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever
...
Fixes runtiming with mineral turfs
2019-04-14 19:56:33 -04:00
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
6441d365df
Merge pull request #6080 from Mechoid/FixAccidentalAlchemy
...
Fixes My Idiocy
2019-04-14 02:48:40 -04:00
fc7c6f38b4
Base features for Precursotech and Anomalotech Expansion
2019-04-13 22:44:52 -04:00
b240e8d60d
Fixes flags anchoring themselves wrong way
2019-04-08 10:34:21 +10:00
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
09b5ae0ac4
AND REMOVES THEM FROM NORMAL ONES
2019-04-08 07:38:22 +10:00
f955d69bd9
Moves destroy_artefact vars to _vr file
2019-04-08 07:37:48 +10:00
7d828a7777
Makes Sonic Jackhammer a 'safe' mining tool
2019-04-08 07:27:02 +10:00
44780295c9
Fixes tiny fans blocking people and not blocking atmos
2019-04-07 11:14:31 +10:00
1519496d9f
Merge pull request #4849 from VOREStation/upstream-merge-5978
...
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
b9adc37685
Standardizes rotation verbs
2019-03-27 03:17:07 -04:00
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
69d4688e28
Unpicks some mining spaghetti ( #5978 )
...
* Untangle xenoarch from mining somewhat
* professionalism
* sonic jackhammers only for artefact-safe tunnelling
* destroy artefacts code disabled on everything
2019-03-12 20:01:15 -04:00
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
71d1a05531
Merge pull request #4543 from VOREStation/upstream-merge-5747
...
[MIRROR] Makes fulltile windows seperate from dir
2019-02-25 08:57:19 -05:00
e4425a700d
[5747] Makes this PR compile again
2019-02-17 01:34:20 -05:00
2bc1f83de7
Merge remote-tracking branch 'upstream/master'
2019-01-15 20:56:39 +00:00
7a22b9767c
Adds Ascian's Shelter Capsule
...
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
2018-12-13 21:28:24 -05:00
300d9086e2
Merge remote-tracking branch 'upstream/master'
2018-12-09 19:45:43 +00:00
fe30b9a61d
Merge pull request #4409 from Novacat/nova-pathfinder
...
Shelter Capsule Content Tweaks
2018-12-08 09:42:18 -05:00
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
eac48b5283
Merge remote-tracking branch 'upstream/master'
2018-10-24 22:07:16 +01:00
e3889b60cb
Moved everything into mapfile
2018-10-24 00:03:24 -04:00
c674f13de4
Nerfs Cash from Mining Vendor
...
The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.
2018-10-20 14:50:43 -04:00
3a510e9779
Tweaks contents a bit more
2018-10-16 22:19:46 -04:00
6dc9e56a44
Shelter Capsule Content Tweaks
...
- Adds some more synth batteries to both capsules
- Removed the Adv first aid kit from the table
- Adds a Basic/Adv/O2/Fire/Toxin kit to luxury storage
- Removes the violin due to being a source of grief
- Changes the bag of dice to a bag of gaming dice
- Luxury capsule now has twice the amount of MREs
The main reasons for this PR:
- Removes shelter capsules as a source of violins, which have been involved in a few... incidents
- Equals the amount of batteries to the amount of liquid foods in the basic capsule, so that synth crew are not required to push for the luxury capsule and its recharger
- Adds a toxin kit to shelter capsules, since toxins are a bigger issue in the phoron-based atmosphere of V2
- Provides a health analyzer to the shelter capsule, the omission of which was very strange.
Rest of the kits were added just for completion sake. All of the ones included be obtained from cargo for a single ten point crate, so the effects on balance will be minimal.
2018-10-16 17:27:35 -04:00
71b8f6582d
Merge remote-tracking branch 'upstream/master'
2018-10-16 22:10:17 +01:00
Novacat