Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Novacat and GitHub
33570d10e6
Update ore_box.dm
2020-02-17 01:33:15 -05:00
Novacat and GitHub
332e3271d9
Update ore_box.dm
2020-02-17 01:31:48 -05:00
Atermonera and VirgoBot
c5b6dfa259
Fixes mining borg ore box movement astral sorcery
2020-02-17 01:18:31 -05:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman3003 and GitHub
0d21e91b68
Merge branch 'master' into belt-mining
2020-02-10 22:47:42 +10:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Atermonera and VirgoBot
16989eaa84
Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix
...
Fixes constant stacking machine runtimes
2020-01-28 14:14:06 -05:00
Shadow
1c5c211734
Aaaaa
2020-01-25 20:17:32 -06:00
Heroman
69ab62b510
pre-defines vacuum mineral turfs to appease travis
2020-01-23 19:07:19 +10:00
Atermonera and VirgoBot
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
RadiantFlash7
827e61e183
Proper syntax and commenting
...
I'm not a smart dev.
2020-01-05 11:21:34 -05:00
RadiantFlash7
e26b48d335
Map fixes.
...
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Atermonera and VirgoBot
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Heroman3003
dfb6ce947b
Fixes shelter lighting when deployed in lighting-unsimulated area
2019-09-26 10:15:19 +10:00
Hawk-v3 and GitHub
0c102792c3
Merge branch 'master' into master
2019-09-19 23:00:15 +01:00
Trilbyspaceclone and GitHub
076ca8c709
flagging it as YAWN code
2019-09-19 17:46:54 -04:00
Trilbyspaceclone and GitHub
933d4de4ab
Update mine_turfs.dm
2019-09-19 17:42:46 -04:00
Hawk_v3
ac61a5cc37
Merge remote-tracking branch 'upstream/master'
2019-09-19 19:54:34 +01:00
Izac Joof Forsgren and GitHub
c747a4f65f
Revert "Makes digging sand 1.5 times as fast"
2019-09-19 18:18:21 +02:00
Trilbyspaceclone and GitHub
2c36ce3e21
30
2019-09-19 08:12:52 -04:00
Trilbyspaceclone and GitHub
3c54fee611
Update mine_turfs.dm
2019-09-18 20:36:26 -04:00
Unknown
69691a209f
No need for wall checks
2019-09-18 15:35:56 -04:00
Unknown
fcaf8906b2
Shelter Capsule Deploy Check
...
...Simpler and hopefully it works
2019-09-18 15:30:59 -04:00
Hawk_v3
9e88f55480
Merge remote-tracking branch 'upstream/release'
2019-09-16 14:57:39 +01:00
Unknown
45d493c0b0
Adds bar shelter capsule to vendors
2019-09-15 21:03:58 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Novacat and GitHub
305e79db40
Merge pull request #5834 from Novacat/nova-heterochromia
...
Cargo hardsuit changes
2019-09-14 00:39:23 -04:00
Unknown
1ae104f4bd
Fixes logic problems
2019-09-13 00:11:47 -04:00
Unknown
4f9fb90e90
Fixes check
2019-09-12 23:29:25 -04:00
Unknown
7fcd2e3f3f
Removes redundant code, fixes whitelists/blacklists
2019-09-12 23:23:22 -04:00
Unknown
5e2abf9fd4
This is becoming a shelter capsule PR
2019-09-12 22:50:03 -04:00
Unknown
db45400201
Same fix, much better code
2019-09-12 01:13:10 -04:00
Unknown
c0f75d7e7b
Miscellaneous Fixes Pt. 2
...
- Shelter Capsules deployed indoors will no longer destroy above turfs.
2019-09-12 00:32:56 -04:00
Unknown
6f5daa6186
Cargo hardsuit changes
...
- Adds new empty hardsuits to cargo.
- Splits the mining vendor Industrial suit from the cargo ordered one
2019-09-09 09:55:00 -04:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Unknown
a7bc6b858d
Redemption Machine Changes
...
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
2019-08-21 20:17:39 -04:00
Novacat and GitHub
17c2ba18be
Update equipment_vendor.dm
2019-08-21 17:49:53 -04:00
Mechoid and VirgoBot
ae48659a68
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
Heroman
e0138738f4
Limits new equipment properly
2019-08-17 12:35:44 +10:00
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
Repede