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
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Atermonera
6374108fa2
Applies same restrictions as first aid to external synth repair
2020-02-10 18:53:31 -05:00
Shadow
c8901d6155
Resizeation
2020-02-10 17:21:59 -06:00
Shadow
7f4c580d19
Minor Changes
2020-02-09 22:30:18 -06:00
Shadow
a7a66003b0
Emergency Lights
2020-02-09 22:16:04 -06: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
Novacat
2366e865f3
Update supermatter.dm
2020-01-25 22:56:18 -05:00
Atermonera
d5869f2c3f
Add an audible alarm sound to SM Delamination
2020-01-25 22:25:49 -05:00
Novacat
1688d86772
Merge pull request #6478 from VOREStation/upstream-merge-6621
...
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Atermonera
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
izac112
eef144f644
Never actually committed that not idea why tortis git thinks i did
...
Revert "Actually puts them on the map"
This reverts commit fa23b4ad0c
2020-01-05 10:36:12 +01:00
izac112
c8bd2e78fa
less efficient tegs at radiants request, can bump it down more if he like but have to keep in mind this thing is going to be running for 20 hours.
...
Signed-off-by: izac112 <izac10@live.com >
2020-01-04 19:21:16 +01:00
Hawk_v3
48b0362f8e
Duplicate Definition
2019-12-29 19:33:40 +00:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Repede
ecb31d04e0
Merge branch 'master' into master
2019-12-22 11:51:38 -05:00
Atermonera
2ec24a29e3
Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click
...
APCs/Air Alarms can be (un)locked via altclick
2019-12-22 01:58:19 -05:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Shadow
058288adb3
The Altening
2019-12-20 21:38:24 -06:00
Atermonera
78f32303a5
Examining power cells state their name and size ( #6577 )
2019-12-20 00:45:43 -05:00
Repede
3c9731879a
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Anewbe
249a05e888
Merge pull request #6554 from Nalarac/Cellicon
...
Protolathe Power Cells Tweak
2019-11-29 19:49:48 -05:00
Repede
9c61982751
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
...
# Conflicts:
# code/game/machinery/vending_yw.dm
# icons/vore/custom_clothes_yw.dmi
# vorestation.dme
2019-11-29 19:13:53 -05:00
RadiantFlash7
d57a9847c6
Disposals, snow, power, exploration
...
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
fixes merge conflict as well.
2019-10-27 15:07:48 -04:00
RadiantFlash7
86e4d8a316
Revert "Revert "Revert "Disposals, exploration, snow fixes"""
...
This reverts commit ad78add3d0
2019-10-27 14:00:53 -04:00
RadiantFlash7
ad78add3d0
Revert "Revert "Disposals, exploration, snow fixes""
...
This reverts commit 0f66788181
2019-10-27 13:57:41 -04:00
RadiantFlash7
0f66788181
Revert "Disposals, exploration, snow fixes"
...
This reverts commit 16e7b75d0b
2019-10-27 13:56:35 -04:00
RadiantFlash7
16e7b75d0b
Disposals, exploration, snow fixes
...
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
2019-10-27 13:19:06 -04:00
Hawk_v3
8edc441c63
Renames for descriptiveness.
...
R&D now knows exactly what every device is.
2019-10-12 21:43:52 +01:00
Hawk_v3
a316232d82
Merge branch 'patch-7' into cells
2019-10-12 21:36:20 +01:00
Hawk-v3
c1af30b4bf
Revert "Revert "Adds in two new cells for sci to get!""
...
This reverts commit 9f3802b9a0
2019-10-12 21:36:02 +01:00
Trilbyspaceclone
8945b98d79
re-adds the alien cell
2019-10-10 19:54:54 -04:00
Hawk_v3
315184978c
Merge remote-tracking branch 'server/master' into patch-7
2019-10-09 17:42:17 +01:00
Trilbyspaceclone
407f21ad05
tech levels
2019-10-09 11:29:31 -04:00
Hawk-v3
9f3802b9a0
Revert "Adds in two new cells for sci to get!"
2019-10-09 16:14:07 +01:00
Hawk-v3
7cde34bfb3
Merge branch 'master' into master
2019-10-08 15:27:01 +01:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Trilbyspaceclone
262517ee06
Apply suggestions from code review
...
Russian to Engish is hard
Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com >
2019-10-07 06:29:28 -04:00
Atermonera
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
TrilbySpaceClone
c245955ead
Suggestions
2019-10-05 22:20:05 -04:00
TrilbySpaceClone
af68971451
maybe it just works
...
whom knows
2019-10-05 18:12:59 -04:00
Hawk_v3
74cc210e21
Merge remote-tracking branch 'server/master' into map
2019-10-05 23:10:09 +01:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Rykka
283f7b6cfd
Adds // Vorestation edit
2019-09-27 15:18:54 -06:00
Rykka
9d8973ef00
Attempts changes again without atrocious filediff
2019-09-27 14:54:50 -06:00
Hawk_v3
fc97b8233b
Merge remote-tracking branch 'upstream/master'
2019-09-08 18:55:37 +01:00
Atermonera
3c36be2390
Merge pull request #6446 from Heroman3003/solarfix
...
Fixes solar panel assembly dupe
2019-09-07 23:34:46 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
