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
Leshana
25fd4147c5
Add debugging logs in an effort to track down the Timer subsystem failure point.
...
Given unsuccessful attempts to reproduce in testing, we need logging in production. These logging statements can be removed once the root cause is discovered.
2020-02-17 20:27:26 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05: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
4fb26a6429
Merge pull request #6620 from Heroman3003/eventpause
...
Pauses event processing while doing event actions
2020-01-15 23:43:46 -05:00
Atermonera
cdca4f68de
Merge pull request #6618 from Shadow-Quill/Event-Manager-Time-Fix
...
Event manager logs now show correct station time
2020-01-15 23:10:32 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Atermonera
0111815165
Buffs radiation so it isn't defeated by a thin sheet of lead.
2019-12-20 00:51:06 -05:00
Unknown
73cd8c0a09
More Fixes
2019-12-10 20:57:04 -05:00
Novacat
a859ed8fac
Revert "Ports Baystation Timer Subsystem"
2019-12-10 20:49:41 -05:00
Unknown
a7711708c8
Fixes Diff issues
2019-12-09 13:22:13 -05:00
Unknown
894bde2c09
Ports Baystation Timer Subsystem
2019-12-09 13:16:07 -05:00
izac112
6d1258bc11
Edit
2019-11-19 22:58:59 +01:00
izac112
f43601eecd
Changes it from "an additional hour" to "an additional four hours"
2019-11-19 22:55:33 +01:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
DigitalSquirrel95
30f751b23f
Update vote.dm
2019-10-11 02:29:58 -04:00
DigitalSquirrel95
bec4591556
Changes the crew transfer message to be more IC friendly.
...
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs. This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.
Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
2019-10-11 01:43:00 -04:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Unknown
dade2aa80b
Conflict Resolution
2019-10-06 13:12:11 -04:00
Atermonera
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
975d879433
Minor Fixes Part two
...
- Ion Spiders now use a weaker ion projectile
- Garbage collection now only complains if it takes longer than two seconds
2019-08-30 20:29:02 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Unknown
04341df092
Timer SS Fix Part two
...
Update of Polaris PR
2019-05-27 01:02:39 -04:00
Unknown
d13e8ee784
Critical Fixes
...
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
2019-05-26 23:58:56 -04:00
Hawk_v3
3aa4e406f9
Merge remote-tracking branch 'upstream/master'
2019-05-15 14:46:50 +01:00
Novacat
69d1e97d2e
Update character_setup.dm
2019-05-13 22:43:00 -04:00
Neerti
318a2f3d09
Ports character setup subsystem from Bay.
2019-05-13 22:39:52 -04:00
Heroman3003
6f80f45eed
Ports character setup subsystem
2019-05-14 11:48:34 +10:00
Hawk_v3
470c86fb45
Merge remote-tracking branch 'upstream/master'
2019-05-08 19:59:55 +01:00
Novacat
909a44ff4c
Update nanoui.dm
2019-05-05 14:17:36 -04:00
Atermonera
1757c30075
Ports #6039 with Virgo Fixes
2019-05-05 14:14:37 -04:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -04:00
Neerti
9c6886395a
Merge pull request #6118 from Novacat/nova-alerts
...
Ports Baystation's SS Debugging
2019-04-25 17:03:43 -04:00
Hawk_v3
5f92049ed7
Yeah no, we like our long rounds.
...
Minimal changes to code.
2019-04-22 21:05:56 +01:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Novacat
557a36e2e5
Conflict Resolution
2019-04-18 13:47:28 -04:00
Atermonera
7f97c8e7cc
Makes transfer always occur if nobody is playing.
2019-04-18 13:45:57 -04:00
Heroman
bc74ea53c9
Removes Command from appearing for players who had it removed
2019-04-15 18:14:04 +10:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Novacat
36e7814477
Update xenoarch.dm
2019-04-14 02:51:07 -04:00
Neerti
49628739b2
Allows restriction of z-levels from spawning xenoarch finds
2019-04-14 02:29:17 -04:00
Heroman
82b9508b0e
Makes nanoui apply properly to roundstart clients
2019-04-12 16:18:54 +10:00
Novacat
af4b960d8e
Merge pull request #4996 from Heroman3003/safety-first
...
Fixes xenoarch spawning on station levels
2019-04-11 15:56:14 -04:00
Heroman3003
95b2c63b85
Allows restriction of Z-levels for xenoarch spawning
2019-04-11 09:55:06 +10:00
Novacat
552cafdb47
Merge pull request #4970 from Novacat/nova-ert
...
Emergency Chemistry/NanoUI/Timer subsystem fixes
2019-04-10 19:39:51 -04:00
Unknown
cecbac2831
Emergency fix to Timer Subsystem
2019-04-10 18:53:15 -04:00
Heroman3003
b85d43bc21
Allows ghosts with backups to ping medical again
2019-04-09 10:28:55 +10:00
