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 |
|
Atermonera
|
1010fd283b
|
Merge pull request #6690 from VOREStation/vplk-ntnet-fixer
Fixes to Modular Computers and NTNet Relays
|
2020-02-21 01:58:20 -05:00 |
|
Shadow
|
b95c2261b2
|
Holowarrants
|
2020-02-20 16:04:51 -06:00 |
|
Arokha Sieyes
|
47ccc655db
|
Deprecate the stream operator
|
2020-02-12 19:38:43 -05:00 |
|
Shadow
|
1e4fa13f67
|
TSS Changes+Update
|
2019-11-23 00:19:38 -06:00 |
|
TrilbySpaceClone
|
c1f2d35b13
|
Ill maintain this I sware!
|
2019-10-05 21:43:09 -04:00 |
|
Heroman
|
8872a08a1a
|
Fixes bugs with suit sensors and tether levels
|
2019-08-17 09:24:57 +10:00 |
|
Heroman
|
a8e3b1e270
|
Replaces Terminated with Dismissed as default rank removal
|
2019-08-03 21:59:56 +10:00 |
|
Heroman
|
0bc5d5b3ba
|
Replaces Termination with Demotions as default rank removal
|
2019-07-28 06:46:05 +10:00 |
|
Heroman3003
|
ca13a8872c
|
MC camera and access fixes and adjustments (#6269)
* Adjusts MC camera program, fixes ID program
* Fixes oversight with network access
|
2019-07-09 14:01:53 -04:00 |
|
Novacat
|
78fc028dba
|
Merge pull request #5420 from VOREStation/upstream-merge-6256
[MIRROR] Fixes '1' message from MCs
|
2019-07-03 13:54:17 -04:00 |
|
Anewbe
|
f4feaf1363
|
Merge pull request #6256 from Heroman3003/fixtheone
Fixes '1' message from MCs
|
2019-07-03 13:11:12 -04:00 |
|
Anewbe
|
e08616f1ee
|
Merge pull request #6260 from Heroman3003/alarmchange
Properly splits security and engineering alarms
|
2019-07-03 13:11:00 -04:00 |
|
Atermonera
|
58c2b2311e
|
Merge pull request #6247 from mistyLuminescence/zruntime
Fixes runtime and GPS problem with invalid Z-levels
|
2019-07-01 20:46:10 -04:00 |
|
Novacat
|
9b291fa5b2
|
Merge pull request #5226 from VOREStation/upstream-merge-6160
[MIRROR] Fixes access restrictions for com&com MC program
|
2019-05-14 00:01:14 -04:00 |
|
Novacat
|
f39068dd19
|
Merge pull request #5225 from VOREStation/upstream-merge-6152
[MIRROR] Restricts alarm monitor MC program access to engineering
|
2019-05-14 00:01:06 -04:00 |
|
Novacat
|
09dedeb6c9
|
Update alarm_monitor.dm
|
2019-05-13 22:57:31 -04:00 |
|
Neerti
|
fb5a2f1904
|
Merge pull request #6160 from Heroman3003/commod-fix
Fixes access restrictions for com&com MC program
|
2019-05-13 22:57:12 -04:00 |
|
Novacat
|
ad5fa6c7e3
|
Update camera.dm
|
2019-05-13 22:57:06 -04:00 |
|
Novacat
|
d95b7fda42
|
Update camera.dm
|
2019-05-13 22:56:41 -04:00 |
|
Neerti
|
74aa8184bf
|
Restricts alarm monitor MC program access to engineering
|
2019-05-13 22:55:57 -04:00 |
|
Neerti
|
31174cee2d
|
Restricts camera access on MC
|
2019-05-13 22:55:47 -04:00 |
|
Anewbe
|
d1c953fb0e
|
Merge pull request #6161 from Heroman3003/atmosaccessfix
Fixes access restriction for MC atmos control
|
2019-05-12 13:57:34 -04:00 |
|
Novacat
|
a8bfa80298
|
Merge pull request #5189 from Heroman3003/mc-camera-access
Restricts access on camera program
|
2019-05-05 20:31:34 -04:00 |
|
Heroman3003
|
c1263a31e8
|
Restricts access on camera program
|
2019-05-06 09:55:58 +10:00 |
|
Heroman3003
|
6c3b174b4a
|
Restricts alarm program to engineering
|
2019-05-06 09:51:30 +10:00 |
|
Neerti
|
16b3b58259
|
[REVIEW] Ports Modular Computers from Baystation
|
2019-04-28 22:06:40 -04:00 |
|