Merge branch 'master' into support/dreamboys

SQL/migrate/V046__radials.sql

@@ -0,0 +1,7 @@
+--
+-- Adds support for underwear updates in PR #8710.
+-- What else do you think this does?
+-- 
+
+ALTER TABLE `ss13_player_preferences`
+    ADD `tooltip_style` ENUM('Midnight', 'Plasmafire', 'Retro', 'Slimecore', 'Operative', 'Clockwork') NULL DEFAULT 'Midnight';

aurorastation.dme

@@ -112,6 +112,8 @@
 #include "code\_onclick\hud\movable_screen_objects.dm"
 #include "code\_onclick\hud\other_mobs.dm"
 #include "code\_onclick\hud\parallax.dm"
+#include "code\_onclick\hud\radial.dm"
+#include "code\_onclick\hud\radial_persistent.dm"
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\_onclick\hud\spell_screen_objects.dm"
@@ -817,6 +819,7 @@
 #include "code\game\objects\items\toys.dm"
 #include "code\game\objects\items\trash.dm"
 #include "code\game\objects\items\devices\aicard.dm"
+#include "code\game\objects\items\devices\augment_implanter.dm"
 #include "code\game\objects\items\devices\binoculars.dm"
 #include "code\game\objects\items\devices\chameleonproj.dm"
 #include "code\game\objects\items\devices\debugger.dm"
@@ -1336,6 +1339,8 @@
 #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm"
 #include "code\modules\client\preference_setup\loadout\loadout.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_augments.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_computer.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_ears.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm"
@@ -2176,6 +2181,7 @@
 #include "code\modules\organs\internal\lungs.dm"
 #include "code\modules\organs\internal\stomach.dm"
 #include "code\modules\organs\internal\species\diona.dm"
+#include "code\modules\organs\subtypes\augment.dm"
 #include "code\modules\organs\subtypes\autakh.dm"
 #include "code\modules\organs\subtypes\diona.dm"
 #include "code\modules\organs\subtypes\industrial.dm"
@@ -2682,6 +2688,7 @@
 #include "code\modules\telesci\telepad.dm"
 #include "code\modules\telesci\telesci_computer.dm"
 #include "code\modules\tgs\includes.dm"
+#include "code\modules\tooltip\tooltip.dm"
 #include "code\modules\turbolift\turbolift.dm"
 #include "code\modules\turbolift\turbolift_areas.dm"
 #include "code\modules\turbolift\turbolift_console.dm"

code/__defines/atmos.dm

@@ -24,7 +24,7 @@
 #define SOUND_MINIMUM_PRESSURE 10
 
 #define PRESSURE_DAMAGE_COEFFICIENT 4 // The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE.
-#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :(
+#define MAX_HIGH_PRESSURE_DAMAGE 4
 #define LOW_PRESSURE_DAMAGE 0.5 // The amount of damage someone takes when in a low pressure area. (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
 
 #define MINIMUM_PRESSURE_DIFFERENCE_TO_SUSPEND (MINIMUM_AIR_TO_SUSPEND*R_IDEAL_GAS_EQUATION*T20C)/CELL_VOLUME			// Minimum pressure difference between zones to suspend

code/__defines/color.dm

@@ -88,6 +88,17 @@
 #define COLOR_CULT             "#402821"
 #define COLOR_CULT_REINFORCED  "#8f3329"
 #define COLOR_CULT_DOOR        "#402821"
+#define COLOR_OIL              "#030303"
+#define COLOR_ASH              "#615C5B"
+#define COLOR_SNOW             "#9CADAD"
+
+
+// Blood colors
+#define COLOR_HUMAN_BLOOD      "#A10808"
+#define COLOR_DIONA_BLOOD      "#97DD7C"
+#define COLOR_IPC_BLOOD        "#1F181F"
+#define COLOR_SKRELL_BLOOD     "#1D2CBF"
+#define COLOR_VAURCA_BLOOD     "#E6E600"
 
 
 //Color defines used by the assembly detailer.

code/__defines/mobs.dm

@@ -111,6 +111,22 @@
 #define BP_OPTICS   "optics"
 #define BP_IPCTAG   "ipc tag"
 
+//Augment organs
+#define BP_AUG_TIMEPIECE    "integrated timepiece"
+#define BP_AUG_PDA          "integrated pda"
+#define BP_AUG_TOOL         "retractable combitool"
+#define BP_AUG_PEN          "retractable combipen"
+#define BP_AUG_LIGHTER      "retractable lighter"
+#define BP_AUG_HEALTHSCAN   "integrated health scanner"
+#define BP_AUG_TESLA        "tesla spine"
+#define BP_AUG_EYE_SENSORS  "integrated eyes sensors"
+#define BP_AUG_HAIR         "synthetic hair extensions"
+#define BP_AUG_SUSPENSION   "calf suspension"
+#define BP_AUG_TASTE_BOOSTER   "taste booster"
+#define BP_AUG_RADIO        "integrated radio"
+#define BP_AUG_FUEL_CELL    "integrated fuel cell"
+#define BP_AUG_AIR_ANALYZER "integrated air analyzer"
+
 //Organ defines
 #define PROCESS_ACCURACY 10
 #define DEFAULT_BLOOD_AMOUNT 560 //Default blood amount in units
@@ -304,6 +320,7 @@
 #define PROSTHETIC_XMG "Xion Manufacturing Group"
 #define PROSTHETIC_DIONA "Unknown Model"
 #define PROSTHETIC_AUTAKH "Aut'akh Manufactured"
+#define PROSTHETIC_TESLA "Tesla Powered Prosthetics"
 
 //Brain Damage defines
 #define BRAIN_DAMAGE_MILD 10

code/_helpers/lists.dm

@@ -144,6 +144,12 @@
 		return picked
 	return null
 
+//Returns the first element from the list and removes it from the list
+/proc/popleft(list/L)
+	if(length(L))
+		. = L[1]
+		L.Cut(1,2)
+
 //Returns the next element in parameter list after first appearance of parameter element. If it is the last element of the list or not present in list, returns first element.
 /proc/next_in_list(element, list/L)
 	for(var/i=1, i<L.len, i++)