Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 ...

# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-05-25 13:23:47 -04:00

..

accounts_terminal.tmpl

…

adv_med.tmpl

Polaris Sync

2017-10-16 22:16:24 -04:00

advanced_airlock_console.tmpl

…

agent_id_card.tmpl

Changelog entry.

2015-08-15 15:25:51 +02:00

aicard.tmpl

Replaces intelliCards with intelliCores.

2017-07-13 00:14:34 -07:00

air_alarm.tmpl

De-cluttered Atmospherics, enabled air vent direction switching, and added digital valve un-wrenching.

2016-12-07 21:50:26 +00:00

alarm_monitor.tmpl

…

algae_farm_vr.tmpl

Oxygen Generator improvements

2017-11-28 22:05:28 -05:00

apc.tmpl

Misc APC fixes & tweaks

2016-11-21 20:04:58 -06:00

appearance_changer.tmpl

Gender tweaking

2016-04-20 20:07:14 +01:00

arcade_battle.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

atmo_control.tmpl

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

atmos_alert.tmpl

…

atmos_control_map_content.tmpl

Add nanomap to the Atmos Control Computer

2017-05-22 16:15:47 -04:00

atmos_control_map_header.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

atmos_control.tmpl

Spelling correction.

2017-11-14 20:09:05 -05:00

atmospheric_scan.tmpl

Refactor common template HTML for atmospheric scan into its own file.

2018-04-27 14:42:42 -04:00

body_designer.tmpl

Adds the Body Designer for resleeving

2017-04-09 16:23:35 -04:00

botany_editor.tmpl

…

botany_isolator.tmpl

…

canister.tmpl

…

chem_disp.tmpl

…

chem_master.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

cloning.tmpl

more fixes and updates. cloning ui fixed.

2016-06-21 23:56:36 -04:00

communicator.tmpl

Refactor common template HTML for atmospheric scan into its own file.

2018-04-27 14:42:42 -04:00

crew_manifest.tmpl

Update and rename pai_manifest.tmpl to crew_manifest.tmpl

2018-03-29 18:14:15 -07:00

crew_monitor_map_content.tmpl

Updated crew monitor computer to support multi-z output and nanomaps.

2017-05-22 16:15:47 -04:00

crew_monitor_map_header.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

crew_monitor.tmpl

Adds Z Coordinate to Suit Sensor Computer

2017-11-21 20:16:32 -05:00

cryo.tmpl

…

disease_splicer.tmpl

…

dish_incubator.tmpl

…

dna_modifier.tmpl

…

dnaforensics.tmpl

Porting forensics from Aurora.

2015-12-10 19:16:28 +10:30

docking_airlock_console.tmpl

…

door_access_console.tmpl

…

door_control.tmpl

…

engines_control.tmpl

…

escape_pod_berth_console.tmpl

…

escape_pod_console.tmpl

…

escape_shuttle_control_console.tmpl

…

exonet_node.tmpl

Adds Telecomms Logging to EPv2

2017-01-07 13:21:03 -05:00

fax.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

flight.tmpl

POLARIS: Add shuttle door/environment sensors

2018-02-03 20:57:49 -05:00

freezer.tmpl

…

gas_pump.tmpl

…

generator.tmpl

…

geoscanner.tmpl

…

guest_pass.tmpl

Fixes a typo in Guest Pass UI template.

2017-06-05 14:21:07 -04:00

hardsuit.tmpl

Rework the Rescue Hardsuit

2017-05-24 21:10:16 -04:00

helm.tmpl

…

holodeck.tmpl

Allows more than one holodeck

2017-04-30 16:53:55 -04:00

identification_computer.tmpl

ID computer can now assign planetside jobs, command secretary, IAA (#4665)

2018-01-31 14:13:12 -06:00

isolation_centrifuge.tmpl

…

janitorcart.tmpl

…

jukebox.tmpl

Implements browser streaming media jukeboxes

2017-03-23 21:10:11 -04:00

laptop_vendor.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

law_manager.tmpl

…

layout_basic.tmpl

…

layout_default.tmpl

…

mechfab.tmpl

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

multi_docking_console.tmpl

…

omni_filter.tmpl

Pol sync part 2

2017-10-27 15:30:51 -04:00

omni_mixer.tmpl

HTML5 and CSS3 (#1677)

2016-05-19 14:28:38 -04:00

operating.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

Oxygen_pump.tmpl

POLARIS: Ports Bay's wall-mounted air pumps

2018-02-18 13:24:23 -06:00

pacman.tmpl

…

pai_atmosphere.tmpl

…

pai_directives.tmpl

Update pai_directives.tmpl

2018-01-14 23:26:42 -08:00

pai_doorjack.tmpl

…

pai_interface.tmpl

Communicator fixes

2017-04-06 18:08:13 -04:00

pai_medrecords.tmpl

Brain type is shown on all records

2017-04-22 18:18:31 -07:00

pai_messenger.tmpl

…

pai_radio.tmpl

fix pAI radios not working

2015-08-05 00:49:28 +01:00

pai_secrecords.tmpl

Brain type is shown on all records

2017-04-22 18:18:31 -07:00

pai_signaller.tmpl

…

partslathe.tmpl

Added the Parts Lathe!

2017-03-01 17:16:16 -05:00

pathogenic_isolator.tmpl

Pathogenic Isolator

2015-08-26 16:11:01 +02:00

pda.tmpl

Refactor common template HTML for atmospheric scan into its own file.

2018-04-27 14:42:42 -04:00

phoron_airlock_console.tmpl

Enhance phoron locks to also manage pressure.

2017-05-11 21:38:38 -04:00

photocopier.tmpl

Fixes part 1

2016-06-20 23:32:18 -04:00

portpump.tmpl

…

portscrubber.tmpl

…

power_monitor_map_content.tmpl

Enhances power monitor computers to use the nano-map to show APC locations.

2017-05-22 16:15:47 -04:00

power_monitor_map_header.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

power_monitor.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

pressure_regulator.tmpl

…

radio_basic.tmpl

Radio NanoUI.

2015-11-22 21:42:54 -05:00

rcon.tmpl

RCON Interface Update (#1545)

2016-05-04 15:35:12 +01:00

request_console.tmpl

Polaris sync

2017-12-21 04:01:07 -05:00

robot_control.tmpl

Removes the Robot Console's ability to blow up borgs

2016-07-10 02:18:24 -05:00

sec_camera_map_content.tmpl

Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers.

2017-05-22 16:15:47 -04:00

sec_camera_map_header.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

sec_camera.tmpl

Switch nanomap computers over to using get_sensor_levels()

2017-05-22 16:18:26 -04:00

shuttle_control_console_exploration.tmpl

…

shuttle_control_console.tmpl

…

simple_airlock_console.tmpl

…

simple_docking_console_pod.tmpl

…

simple_docking_console.tmpl

…

sleeper.tmpl

More fixes

2017-10-15 19:54:50 -04:00

sleever.tmpl

Adds the Body Designer for resleeving

2017-04-09 16:23:35 -04:00

smartfridge.tmpl

…

smes.tmpl

Changes to SMES

2016-04-22 00:58:11 +02:00

supermatter_crystal.tmpl

…

tanks.tmpl

…

telescience_console.tmpl

Improve Telescience playability by changing how targeting works, niceness, and FUN.

2017-02-22 21:52:01 -05:00

TemplatesGuide.txt

Updated old wiki link to a new one.

2015-08-11 17:20:55 +03:00

timeclock_vr.tmpl

Adds Timeclock Terminals: A machine for viewing your PTO balance.

2018-02-18 20:42:22 -05:00

transfer_valve.tmpl

…

turbine_computer.tmpl

Make gas turbine constructable and operational

2018-02-22 15:43:38 -05:00

turret_control.tmpl

…

uplink.tmpl

Adds fluff antag factions, antag visibility options for uplinks.

2016-06-29 11:25:52 -04:00

vending_machine.tmpl

…

xenobio_computer.tmpl

Fixes NanoUI displayBar's

2016-05-30 13:25:47 -04:00

xenobio_editor.tmpl

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00

xenobio_isolator.tmpl

Final Initial Implementation of Xenobio2 System.

2016-05-25 14:11:37 -04:00

zone_console.tmpl

Belter emergency shuttle recall and bugfixes.

2017-02-14 20:45:02 -05:00