Commit Graph

286 Commits

Author SHA1 Message Date
Heroman
a8c4ac11c4 Does some adjustment to _vr job things 2020-03-19 14:20:11 +10:00
Novacat
194c9f7a63 Merge pull request #6841 from VOREStation/upstream-merge-6818
[MIRROR] Fully Implements R_EVENT for Event Managers
2020-03-15 17:01:36 -04:00
Atermonera
3ac5a32e39 Fixes the occupation screen. 2020-03-15 14:35:59 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Heroman
a7a9080362 Separates PTO being earned into its own var 2020-03-12 11:47:55 +10:00
izac112
4c1ecc4cd3 Ports Inactivity SS from Bay (Polaris Mirror)
Novacat commented 3 days ago
Remember that server-destroying timer bug that VORE keeps getting?

Turns out, it is related to the inactivity subsystem, that, due to having SS_BACKGROUND and SS_NO_TICK_CHECK flags, causes the master controller to break in a horrible way. One of the consequences of the master controller breaking is that the timer subsystem stops running.

I am relieved that this monster of a bug has finally been slain. Hopefully.
2020-03-12 00:39:27 +01:00
Leshana
9cbdf184ff Ported Basic Overmap Functionality
- Ports the overmap, ships, sectors, and "landable" ships from baystation.
- Ports necessary computers to control ships and overmap shuttles.
- Shims missing machine and computer functionality pending future enhancements.
- Includes required new sprites and sounds.
2020-03-11 11:11:40 -04:00
Leshana
86c435f4b7 Ports Skybox Parallax
- Port based on Baystation's implementation and customized for our code and usages.
- Switched space icon_state permutation to a "dust" overlay that is permutated the same way. As an overlay, the dust can be *above* the parallax planes. Space turfs are now white to allow skybox to BLEND_MULTIPLY onto them.
- Added skybox hud effect that replaces background space turfs with an image moved to create a parallax effect.
- Added skybox subsystem to generate and manage skybox parallax images, and lots of images for it!
2020-03-11 11:11:40 -04:00
Unknown
b2cd0eade0 Converts off duty system to new system 2020-03-09 15:37:45 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Arokha Sieyes
32ccb0901a Port Bay's inactivity subsystem 2020-03-09 00:53:31 -04:00
Atermonera
217dabd31c Merge pull request #6789 from VOREStation/pol-busysignal
Moving AI busy check so it's performed less and more centrally
2020-03-05 15:14:36 -05:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles.
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes
Don't do this, the asset subsystem does this for you
2020-03-01 14:14:52 -05:00
Repede
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
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes
Fixes various lightning strike bugs
2020-02-27 23:58:36 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Leshana
3c03a71107 Investigate what causes us to bail out early when timer system breaks. 2020-02-23 00:42:56 -05:00
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
ShadowLarkens
22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -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