Commit Graph

948 Commits

Author SHA1 Message Date
Aronai Sieyes
10ffcd32aa Merge pull request #7154 from VOREStation/aro-pipes
Adds 2 new pipe types
2020-04-10 10:18:46 -04:00
Novacat
fc7284ca1a Merge pull request #7189 from VOREStation/upstream-merge-6969
[MIRROR] Adds preference to output description_info with examine text
2020-04-10 08:39:33 -04:00
Atermonera
a85b953ef4 Adds preference to output description_info with examine text (#6969)
* Adds preference to output description_info with examine text

* includes the defines file
2020-04-10 01:21:21 -04:00
Atermonera
ba4af183f4 Increases SSjobs init priority so it's accessible earlier (#6955) 2020-04-10 01:20:08 -04:00
Aronai Sieyes
ce8bda7cd7 Merge pull request #7118 from VOREStation/vplk-shields
Ports Baystation Advanced Shield Generators
2020-04-07 23:53:12 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Arokha Sieyes
f0bc46cc49 Add 2 new pipe types 2020-04-05 23:05:33 -04:00
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
RadiantFlash7
909393115d Merge pull request #8 from Yawn-Wider/master
Updating my Branch
2020-04-03 22:34:31 -04:00
RadiantFlash7
8692c589f1 Security update++ Geigers and more
Rebuilds security to /not/ suck.
Left Vacant office for security Next to HoS office, for the Security Pilot Officer (To be added in future)
Dock for Interceptor left near sec.
New Geigers added around the map!
Vents and scrubber fixes.
adds in HoP req console which was not in by default.
2020-04-03 22:14:39 -04:00
Leshana
e2bd546f61 Ports advanced shield generators from Baystation
- Creates new advanced shield generators, designed to replace old hull and bubble shield generators.
- Upgrades the floor mounted and handheld shield diffusers.
- Makes underfloor shield diffusers actually constructable.
- Handheld diffusers orderable via uplink.
- Removes supply packs and research datums  for the old generators, but leaves their code in place for maps that still use them.
- Integrates with the meteor and electrical storm events.
- Integrates with mob AI (they know how to attack it)
2020-04-03 00:56:15 -04:00
Aronai Sieyes
74134e4ac9 Looking Glass Holodecks 2020-04-02 23:42:47 -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
09003a6c61 Improve space map edges 2020-04-02 01:08:07 -04:00
Leshana
f022647037 Adds point defense batteries to defend against meteors
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
2020-04-01 21:30:30 -04:00
Leshana
23482e88fa Moves topic return value defines to where they are usable everywhere. 2020-04-01 20:36:00 -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
26a2a8504d Merge pull request #7020 from VOREStation/upstream-merge-6761
[MIRROR] VChat: Redone chat output done in Vue.js
2020-03-29 17:51:20 -04:00
Aronai Sieyes
b2605300f2 Mergey Merge Polaris VChat 2020-03-29 15:37:43 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Aronai Sieyes
8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Leshana
96a3242c6e Remove temporary debug logging from SStimer 2020-03-25 00:18:19 -04:00
Atermonera
4384ca1727 Xenoarch Expansion 2020-03-24 21:43:27 -04:00
Aronai Sieyes
1c38bd11ca VR Cloaking framework 2020-03-23 21:34:32 -04:00
Aronai Sieyes
c93c5afefa Adds atom/movable cloaking framework 2020-03-23 21:34:32 -04:00
Aronai Sieyes
7cb680ab34 Merge pull request #6918 from VOREStation/upstream-merge-6826
[MIRROR] Port Landmark Shuttles
2020-03-21 00:52:08 -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
Leshana
143ca9d981 Fixes and additional mapping convenience for landmark shuttles.
- Improvement to web-shuttle: Don't update docking controller until jump() is completed.
  - It is now consistent with autodock behavior (for better or worse)
- Add shuttle process_state to enable processing of web shuttle autopilot.
- Convert Arrivals shuttles to be a subtype of /datum/shuttle/autodock/ferry
- Default shuttle landmarks flags to SLANDMARK_FLAG_AUTOSET
  - Made this safe and backwards compatible by having SLANDMARK_FLAG_AUTOSET not overwrite already specified base_turf or base_area
2020-03-19 20:23:04 -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
Novacat
4cd077019f Merge pull request #6683 from Novacat/nova-heterochromia
Species consolidation
2020-03-19 18:55:54 -04:00
Aronai Sieyes
a2be7ed5dd Split air alarm and fire alarm files, move new to initialize 2020-03-19 15:50:53 -04:00
Heroman
a8c4ac11c4 Does some adjustment to _vr job things 2020-03-19 14:20:11 +10:00
Unknown
c960a9ec30 Finishes this PR 2020-03-17 14:00:02 -04:00
Unknown
a6a12b3a9e Merge remote-tracking branch 'VOREStation/master' into nova-heterochromia 2020-03-17 13:16:11 -04:00
Leshana
9d517f469f Simplify skybox parallax code and add support for scaling for larger client.view sizes.
- Hooked up skybox to recalculate it's scaling when the view changes.
 - Added constant defines to clarify where the magic numbers are coming from.
2020-03-15 17:59:20 -04:00
Heroman
a7a9080362 Separates PTO being earned into its own var 2020-03-12 11:47:55 +10:00
Aronai Sieyes
28c9ff82fa Merge pull request #6808 from VOREStation/vplk-overmap
Overmap Skybox, Ships, Sectors, and Boats
2020-03-11 20:15:09 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04: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
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Novacat
f6b72c9997 Update subsystems.dm 2020-03-09 01:27:06 -04:00
Novacat
1b5fcc052c Update misc.dm 2020-03-09 01:26:36 -04:00
Shadowfire
3c3817ecd3 Bug fixing, improvements to furniture, jukebox change
Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic
2020-03-07 09:49:36 +01: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
9db702abf7 Increment VIS defines for mob huds
Prevents mob intents from being visible
2020-03-01 13:42:56 -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