Commit Graph

414 Commits

Author SHA1 Message Date
Repede
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
Aronai Sieyes
1626df366c Merge pull request #7102 from VOREStation/aro-fakez
Improves space edge-of-map behavior and add mapping tools
2020-04-02 10:58:13 -04:00
Aronai Sieyes
f080a4baf3 [PORT] Speed up map load significantly 2020-04-02 10:25:03 -04:00
Aronai Sieyes
09003a6c61 Improve space map edges 2020-04-02 01:08:07 -04:00
Novacat
1cdd572e6a Merge pull request #7060 from VOREStation/upstream-merge-6902
[MIRROR] Convert alarm_manager into SSalarm subsystem.
2020-03-31 11:45:08 -04:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm
Convert alarm_manager into SSalarm subsystem.
2020-03-30 20:41:10 -04:00
Aronai Sieyes
cdb2336bf7 VS: Convert bellies to processing subsystem 2020-03-30 16:11:30 -04:00
Aronai Sieyes
85805e8ffe Merge pull request #7050 from VOREStation/aro-procdebug
Add Recover() to processing subsystems
2020-03-30 13:15:55 -04:00
Aronai Sieyes
1205f01b0d VS: Bellies should probably be a processing subsystem 2020-03-30 12:18:40 -04:00
Aronai Sieyes
b77334cb95 Tweak output and check SSobjs and SSturfs for types 2020-03-30 12:14:53 -04:00
Aronai Sieyes
a19021887f Add Recover() to processing subsystems 2020-03-30 12:02:22 -04:00
Aronai Sieyes
cbc513314a Update inactivity.dm 2020-03-29 18:18:44 -04:00
Atermonera
255809524d Inactivity subsystem kicks ghosts and admins again 2020-03-29 17:50:24 -04:00
Aronai Sieyes
3e0e45468a Merge pull request #7019 from VOREStation/upstream-merge-6888
[MIRROR] Port Overmap Skybox, Ships, Sectors, and Boats
2020-03-29 15:33:49 -04:00
Leshana
42494162e3 Fix: Actually apply configured skybox color.
Also set default icon_state for space turfs so they are seen in the map editor.
2020-03-27 18:08:17 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Leshana
96a3242c6e Remove temporary debug logging from SStimer 2020-03-25 00:18:19 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
2020-03-19 20:29:43 -04:00
Novacat
15273a356c Merge pull request #6913 from Heroman3003/jobstuff
Does some adjustment to _vr job things
2020-03-19 19:00:25 -04:00
Aronai Sieyes
b95ca5568c Faster lookup of self-init on atoms 2020-03-19 15:51:01 -04:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2020-03-19 00:29:24 -04:00
Aronai Sieyes
9250685a06 VS-specific changes for mapload time 2020-03-19 00:27:47 -04:00
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
Razgriz
aafc858b30 Merge pull request #235 from Shadowfire117/Fluidvorebellies
Liquid vore bellies!
2020-02-19 01:28:34 -07:00
Shadowfire117
4b3cb05137 Update bellies_vr.dm 2020-02-18 12:43:32 +01: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
Shadowfire
71b3c11df7 Liquid vore bellies!
After a week of non-stop work on coding this its finally here! Churn your friends into different liquids in your vore bellies, make some over time using nutrition, empty into containers, into other vore bellies or stomach, even into other people as well! You can write custom messages for every belly for people to see if you want them to, so this vore addition works well for not only vore, but also for inflation and other 'kinky' things, bottoms can take advantage of this as well to show off 'donation's from your tops!

It works for anything that has a vorepanel, so synths and borgs can also join in on the fun! (Not an expert on those folks, so sorry if there are some bugs when I made it to include them :c)

I plan on making on the second phase of this poject (wont start now, I need break and feedback x.x):

Allow people to set transfer verbs and custom names for liquids when they are transfered, sorry, there wont be actual custom fluids, thats not something that can really be done easily if at all!
Toggle for belly noises when walking around, so the more full people are the more often and clearly sloshing and such is heard
More reagents! Do give tell what you would like, of course meds and absurd chems will be a no!
Certain races/synths/borgs will be able to select additional liquids they can already produce in non-vore way!
Potential round persistency of liquids! This will only be the fullness of belly, not the content, since this can be abused to transfer powergaming reagents across shifts! So selected reagent of belly will be what the belly contains
Adjust how quick and slow the rate of liquid production can be
Possible custom messages to replace normal vore messages when at certain intervals of fullness, like prey splashing in fluids, folks seeing struggle messages with bulges appearing on liquid filled belly
Puddles! Puddles which name and color are based on fluid spilled on floor! Will also mean transfer will get a choice to dump onto floor

Finally I wanna thank Jon for a lot of code help, and Aronai to get the few final kinks worked out!
2020-02-16 12:40:29 +01:00