eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
af2b83379a
Add VS Edit
...
Arokha's recommendation
Co-Authored-By: Aronai Sieyes <arokha@arokha.com >
2020-04-02 03:31:43 +00:00
bb756cbdc9
Adds a Rocky Diet
...
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.
5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
2020-04-01 21:52:27 -04:00
bf2b02aa34
VS: Tweak because of mining vendor sprite
2020-03-31 13:56:38 -04:00
9b07ee0a29
Mining equipment vendor use new vendor sprite
2020-03-31 13:56:38 -04:00
dca2e93209
VS: Conflict Resolution + VS Changes
...
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
2020-03-31 13:56:38 -04:00
f87e63f95a
Delete ore_datum_vr.dm
2020-03-29 13:48:09 -04:00
cbb40196fc
Machinery: Always use update_use_power()
2020-03-23 23:21:10 -04:00
f28dcdb2d4
Merge pull request #6855 from Schnayy/newterrain
...
POI wall nonsense
2020-03-18 04:10:18 -04:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
2f2fd40841
Earlyport Xenoarch Fixy
...
Title. Earlyports fix for Xenoarch bug that wrecks a high number of finds even with the field used.
Changelong Notes:
- Fixes bug that made finding, well, finds get destroyed at a high frequency.
2020-03-14 12:24:28 -04:00
6a2e400af5
Earlyport Xenoarch Fixy
...
Title. Earlyports fix for Xenoarch bug that wrecks a high number of finds even with the field used.
Changelong Notes:
- Fixes bug that made finding, well, finds get destroyed at a high frequency.
2020-03-14 12:23:52 -04:00
0185f541e3
Merge pull request #6821 from PrismaticGynoid/xenoarch_fix
...
Xenoarch fix
2020-03-13 10:47:13 -04:00
e45a95d365
Robotics Expansion: RIG-ged and Ready
2020-03-11 15:56:18 -04:00
1255e1be77
Hybrid shuttle
2020-03-05 23:30:07 -05:00
f2b8f92b63
Merge remote-tracking branch 'upstream/master' into releaseupdate
2020-03-02 17:55:11 +00:00
f71bfa7100
Ore Scanner is written incorrectly
...
Only revealed by vchat
2020-03-01 17:22:31 -05:00
c45d7c2196
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/modules/events/event_container_vr.dm
# icons/misc/title_vr.dmi
# interface/skin.dmf
# vorestation.dme
2020-03-01 12:35:52 -05:00
b44f8e0911
Merge pull request #6592 from VOREStation/vchat-rebase
...
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
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
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
1d9e5be122
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
33570d10e6
Update ore_box.dm
2020-02-17 01:33:15 -05:00
332e3271d9
Update ore_box.dm
2020-02-17 01:31:48 -05:00
c5b6dfa259
Fixes mining borg ore box movement astral sorcery
2020-02-17 01:18:31 -05:00
11268a3ff4
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge
2020-02-13 20:36:32 -08:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
0d21e91b68
Merge branch 'master' into belt-mining
2020-02-10 22:47:42 +10:00
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
b5849dbc65
Adds a clotting injector to exploration vendor
...
This costs 80 survey points.
2020-01-29 21:52:31 -05:00
16989eaa84
Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix
...
Fixes constant stacking machine runtimes
2020-01-28 14:14:06 -05:00
8fbb301afb
Stacker Runtime Fix
2020-01-25 20:32:15 -06:00
1c5c211734
Aaaaa
2020-01-25 20:17:32 -06:00
69ab62b510
pre-defines vacuum mineral turfs to appease travis
2020-01-23 19:07:19 +10:00
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
4a78b14451
Port over Roundstats System
2020-01-15 16:42:41 -07:00
827e61e183
Proper syntax and commenting
...
I'm not a smart dev.
2020-01-05 11:21:34 -05:00
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
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
dfb6ce947b
Fixes shelter lighting when deployed in lighting-unsimulated area
2019-09-26 10:15:19 +10:00
0c102792c3
Merge branch 'master' into master
2019-09-19 23:00:15 +01:00
076ca8c709
flagging it as YAWN code
2019-09-19 17:46:54 -04:00
933d4de4ab
Update mine_turfs.dm
2019-09-19 17:42:46 -04:00
ac61a5cc37
Merge remote-tracking branch 'upstream/master'
2019-09-19 19:54:34 +01:00
c747a4f65f
Revert "Makes digging sand 1.5 times as fast"
2019-09-19 18:18:21 +02:00
2c36ce3e21
30
2019-09-19 08:12:52 -04:00
Erik