Merge remote-tracking branch 'upstream/master' into fuck-you

_maps/map_files/generic/CentCom.dmm

@@ -154,7 +154,7 @@
 /turf/open/floor/plating,
 /area/ctf)
 "agI" = (
-/obj/machinery/power/emitter/energycannon{
+/obj/machinery/power/emitter/energycannon/ctf{
 	active = 0
 	},
 /turf/open/floor/plating,
@@ -163,7 +163,7 @@
 /turf/open/floor/plating,
 /area/ctf)
 "aha" = (
-/obj/machinery/power/emitter/energycannon{
+/obj/machinery/power/emitter/energycannon/ctf{
 	active = 0;
 	dir = 1
 	},

_maps/shuttles/inteq/inteq_colossus.dmm

@@ -195,6 +195,12 @@
 	name = "uniform closet"
 	},
 /obj/machinery/firealarm/directional/east,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "cq" = (

_maps/shuttles/inteq/inteq_talos.dmm

@@ -4071,6 +4071,12 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "zg" = (

_maps/shuttles/inteq/inteq_valor.dmm

@@ -4599,6 +4599,12 @@
 /obj/item/clothing/head/soft/inteq,
 /obj/structure/closet/wall/directional/north,
 /obj/machinery/airalarm/directional/east,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "RF" = (

_maps/shuttles/inteq/inteq_vaquero.dmm

@@ -1208,6 +1208,12 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "ui" = (

_maps/shuttles/pgf/pgf_crying_sun.dmm

@@ -425,13 +425,13 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "du" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 6;
-	mode = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/porta_turret/ship/pgf/light{
+	dir = 6;
+	mode = 1
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
 "dv" = (
@@ -1050,11 +1050,11 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/porta_turret/ship/weak{
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/porta_turret/ship/pgf/light{
 	dir = 4;
 	mode = 1
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating/airless,
 /area/ship/external/dark)
 "ih" = (
@@ -2335,16 +2335,6 @@
 /obj/effect/turf_decal/floordetail/tiled,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
-"tU" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	mode = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/engine/hull,
-/area/ship/external/dark)
 "tY" = (
 /obj/machinery/modular_computer/console/preset/command{
 	dir = 1
@@ -3452,13 +3442,13 @@
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "CF" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 10;
-	mode = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/porta_turret/ship/pgf/light{
+	dir = 10;
+	mode = 1
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
 "CO" = (
@@ -3732,11 +3722,11 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Eu" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/structure/cable,
+/obj/machinery/porta_turret/ship/pgf/light{
 	dir = 5;
 	mode = 1
 	},
-/obj/structure/cable,
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
 "EA" = (
@@ -3996,13 +3986,13 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "FJ" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 5;
-	mode = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/porta_turret/ship/pgf/light{
+	dir = 5;
+	mode = 1
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
 "FN" = (
@@ -4017,13 +4007,13 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "FO" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 8;
-	mode = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/porta_turret/ship/pgf/light{
+	dir = 8;
+	mode = 1
+	},
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "FU" = (
@@ -4253,13 +4243,13 @@
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Hb" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 4;
-	mode = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/porta_turret/ship/pgf/light{
+	dir = 5;
+	mode = 1
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
 "Hf" = (
@@ -7804,7 +7794,7 @@ xz
 xz
 xz
 xz
-tU
+Hb
 xk
 UE
 pW

code/__DEFINES/factions.dm

@@ -8,7 +8,7 @@
 #define FACTION_PLAYER_NANOTRASEN "playerNanotrasen"
 #define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen"
 #define FACTION_PLAYER_MINUTEMAN "playerMinuteman"
-#define FACTION_PLAYER_SOLGOV "playerSolgov"
+#define FACTION_PLAYER_SOLCON "playerSolcon"
 #define FACTION_PLAYER_INTEQ "playerInteq"
 #define FACTION_PLAYER_ROUMAIN "playerRoumain"
 #define FACTION_PLAYER_GEZENA "playerGezena"

code/__DEFINES/fonts.dm

@@ -19,3 +19,5 @@
 #define SHARE "Share Tech Mono"
 
 GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE)))
+
+#define EMOJI_SET 'icons/emoji.dmi'

code/_onclick/hud/alert.dm

@@ -190,15 +190,40 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
 	icon_state = "gross3"
 
 /atom/movable/screen/alert/hot
-	name = "Too Hot"
-	desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit."
+	name = "Hot"
+	desc = "It's quite warm. Get somewhere cooler and take off any insulating clothing like a fire suit."
+	icon_state = "hot"
+
+/atom/movable/screen/alert/warm
+	name = "Warm"
+	desc = "It's a bit warm, but not unbearably so."
 	icon_state = "hot"
 
 /atom/movable/screen/alert/cold
-	name = "Too Cold"
-	desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit."
+	name = "Cold"
+	desc = "It's quite cold. Get somewhere warmer and take off any insulating clothing like a space suit."
+	icon_state = "cold"
+
+/atom/movable/screen/alert/chilly
+	name = "Chilly"
+	desc = "It's a bit chilly, but not unbearably so."
 	icon_state = "cold"
 
+/atom/movable/screen/alert/sweat
+	name = "Sweating"
+	desc = "You're sweating and the heat is starting to hurt. Get somewhere cooler and take off any insulating clothing like a fire suit."
+	icon_state = "sweat"
+
+/atom/movable/screen/alert/shiver
+	name = "Shivering"
+	desc = "You're shivering and the cold is starting to hurt. Get somewhere warmer and take off any insulating clothing like a space suit."
+	icon_state = "shiver"
+
+/atom/movable/screen/alert/fans
+	name = "High Fan Speed"
+	desc = "Your fans are spinning quite fast, and your components are reaching a dangerous temperature! Get somewhere cooler and take off any insulating clothing like a fire suit."
+	icon_state = "fans"
+
 /atom/movable/screen/alert/lowpressure
 	name = "Low Pressure"
 	desc = "The air around you is hazardously thin. A space suit would protect you."

code/datums/components/storage/concrete/pockets.dm

@@ -91,6 +91,7 @@
 		/obj/item/clothing/glasses/hud/health/night,
 		/obj/item/clothing/glasses/hud/security/night,
 		/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+		/obj/item/clothing/glasses/sunglasses/ballistic,
 		/obj/item/ammo_casing,
 		/obj/item/ammo_box/magazine/illestren_a850r,
 	))

code/game/machinery/porta_turret/portable_turret.dm

@@ -832,8 +832,8 @@ DEFINE_BITFIELD(turret_flags, list(
 	stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
 	desc = "A ballistic machine gun auto-turret."
 
-/obj/machinery/porta_turret/ship/solgov
-	faction = list("playerSolgov", "turret")
+
+/* Syndicate Turrets */
 
 /obj/machinery/porta_turret/ship/syndicate
 	faction = list(FACTION_PLAYER_SYNDICATE, "turret")
@@ -856,6 +856,39 @@ DEFINE_BITFIELD(turret_flags, list(
 	lethal_projectile = /obj/projectile/beam/laser/heavylaser
 	lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
 
+/* Solcon Turrets */
+
+/obj/machinery/porta_turret/ship/solgov
+	faction = list(FACTION_PLAYER_SOLCON, "turret")
+
+/* Pan Gezena Federation Turrets */
+
+/obj/machinery/porta_turret/ship/pgf
+	name = "Etherbor Defensive Mount"
+	desc = "A less portable Etherbor offering, the EDM is a self-directed linkage of energy weapons, designed to keep intruders away from Gezenan vessels."
+	faction = list(FACTION_PLAYER_GEZENA, "Turret")
+	stun_projectile = /obj/projectile/beam/hitscan/disabler
+	stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
+	lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/assault
+	lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
+	icon_state = "standard_lethal"
+	base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/pgf/light
+	name = "Etherbor Deterrent System"
+	desc = "A light turret manufactured by Etherbor. It offers a lightweight assembly of energy weapons to accost nearby foes."
+	lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf
+	lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
+
+/obj/machinery/porta_turret/ship/pgf/heavy
+	name = "Etherbor Point-Defense System"
+	desc = "A high-powered defensive turret manufactured by Etherbor. The EPDS contains heavy energy weapons linked in tandem."
+	scan_range = 10
+	stun_projectile = /obj/projectile/beam/hitscan/disabler/heavy
+	stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
+	lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/sniper //fwoom
+	lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+
 ////////////////////////
 //Turret Control Panel//
 ////////////////////////

code/game/objects/effects/turf_fire.dm

@@ -5,7 +5,7 @@
 #define TURF_FIRE_VOLUME 150
 #define TURF_FIRE_MAX_POWER 50
 
-#define TURF_FIRE_ENERGY_PER_BURNED_OXY_MOL 12000
+#define TURF_FIRE_ENERGY_PER_BURNED_OXY_MOL 30000
 #define TURF_FIRE_BURN_RATE_BASE 0.12
 #define TURF_FIRE_BURN_RATE_PER_POWER 0.02
 #define TURF_FIRE_BURN_CARBON_DIOXIDE_MULTIPLIER 0.75

code/game/objects/items/devices/PDA/cart.dm

@@ -446,7 +446,7 @@ Code:
 			if(!emoji_table)
 				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 				var/list/collate = list("<br><table>")
-				for(var/emoji in sortList(icon_states(icon('icons/emoji.dmi'))))
+				for(var/emoji in sortList(icon_states(icon(EMOJI_SET))))
 					var/tag = sheet.icon_tag("emoji-[emoji]")
 					collate += "<tr><td>[emoji]</td><td>[tag]</td></tr>"
 				collate += "</table><br>"

code/modules/asset_cache/asset_list_items.dm

@@ -155,6 +155,15 @@
 	)
 	parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css')
 
+/datum/asset/simple/namespaced/tgfont
+	assets = list(
+		"tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"),
+		"tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"),
+	)
+	parents = list(
+		"tgfont.css" = file("tgui/packages/tgfont/static/tgfont.css"),
+	)
+
 /datum/asset/simple/fonts
 	assets = list(
 		"sga.ttf" = 'html/sga.ttf'
@@ -169,8 +178,8 @@
 /datum/asset/spritesheet/chat
 	name = "chat"
 
-/datum/asset/spritesheet/chat/register()
-	InsertAll("emoji", 'icons/emoji.dmi')
+/datum/asset/spritesheet/chat/create_spritesheets()
+	InsertAll("emoji", EMOJI_SET)
 	// pre-loading all lanugage icons also helps to avoid meta
 	InsertAll("language", 'icons/misc/language.dmi')
 	// catch languages which are pulling icons from another file
@@ -180,7 +189,6 @@
 		if (icon != 'icons/misc/language.dmi')
 			var/icon_state = initial(L.icon_state)
 			Insert("language-[icon_state]", icon, icon_state=icon_state)
-	..()
 
 /datum/asset/simple/lobby
 	assets = list(