merge conflict

code/modules/antagonists/nukeop/nukeop.dm

@@ -36,7 +36,6 @@
 	var/mob/living/carbon/human/H = owner.current
 	H.set_species(/datum/species/human) //Plasamen burn up otherwise, and lizards are vulnerable to asimov AIs
 	H.equipOutfit(nukeop_outfit)
-	H.checkloadappearance()
 	return TRUE
 
 /datum/antagonist/nukeop/greet()
@@ -53,6 +52,8 @@
 	memorize_code()
 	if(send_to_spawnpoint)
 		move_to_spawnpoint()
+	var/mob/living/carbon/human/H = owner.current
+	H.checkloadappearance()
 
 /datum/antagonist/nukeop/get_team()
 	return nuke_team

code/modules/clothing/head/soft_caps.dm

@@ -124,7 +124,7 @@
 	dog_fashion = null
 
 /obj/item/clothing/head/soft/emt
-	name = "EMT cap"
+	name = "paramedic cap"
 	desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
 	icon_state = "emtsoft"
 	item_color = "emt"

code/modules/clothing/suits/labcoat.dm

@@ -38,10 +38,10 @@
 	item_state = "labcoat_cmo"
 
 /obj/item/clothing/suit/toggle/labcoat/emt
-	name = "\improper EMT's jacket"
-	desc = "A dark blue jacket with reflective strips for emergency medical technicians."
+	name = "paramedic's jacket"
+	desc = "A dark blue jacket for paramedics with reflective stripes."
 	icon_state = "labcoat_emt"
-	item_state = "labcoat_cmo"
+	item_state = "labcoat_emt"
 
 /obj/item/clothing/suit/toggle/labcoat/mad
 	name = "\proper The Mad's labcoat"

code/modules/clothing/under/jobs/medsci.dm

@@ -204,4 +204,21 @@
 	item_color = "medical_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP 
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/medical/emt
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	name = "paramedic jumpsuit"
+	icon_state = "emt"
+	item_state = "w_suit"
+	item_color = "emt"
+
+/obj/item/clothing/under/rank/medical/emt/skirt
+	name = "paramedic jumpskirt"
+	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
+	icon_state = "emt_skirt"
+	item_state = "w_suit"
+	item_color = "emt_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP

code/modules/mob/mob_helpers.dm

@@ -506,31 +506,3 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 			. = BLOOD_COLOR_BUG
 		//add more stuff to the switch if you have more blood colors for different types
 		// the defines are in _DEFINES/misc.dm
-
-mob/proc/checkloadappearance()
-	var/mob/living/carbon/human/H = src
-	//This will be where the person gets to select their appearance instead of the random character
-	if (world.time <= (H.time_initialized + 900) && H.mirrorcanloadappearance == TRUE)
-		SEND_SOUND(H, 'sound/misc/server-ready.ogg')
-		to_chat(H, "<span class='boldannounce'>This ghost role allows you to select your loaded character's appearance. Make sure you have your ID in your ID slot, if you have one.</span>")
-		if(alert(H, "Would you like to load your currently loaded character's appearance?", "This can only be done up until 90s after you spawn.", "Yes", "No") == "Yes" && world.time <= (H.time_initialized + 900))
-			H.client.prefs.copy_to(H)
-			if (H.custom_body_size) //Do they have a custom size set?
-				H.resize(H.custom_body_size * 0.01)
-			H.real_name = H.client.prefs.real_name
-			H.mind.name = H.real_name //Makes sure to change their mind name to their real name.
-			SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, H.job, FALSE)//This Assigns the selected character's quirks
-			H.dna.update_dna_identity() //This makes sure their DNA is updated.
-			var/obj/item/card/id/idCard = H.get_idcard() //Time to change their ID card as well if they have one.
-			if (idCard != null)
-				idCard.update_label(H.real_name, idCard.assignment)
-				idCard.registered_name = H.real_name
-			H.mirrorcanloadappearance = FALSE //Prevents them from using the mirror again.
-			SEND_SOUND(H, 'sound/magic/charge.ogg') //Fluff
-			to_chat(H, "<span class='boldannounce'>Your head aches for a second. You feel like this is how things should have been.</span>")
-			log_game("[key_name(H)] has loaded their default appearance for a ghost role.")
-			message_admins("[ADMIN_LOOKUPFLW(H)] has loaded their default appearance for a ghost role.")
-			return
-		else
-			to_chat(H, "<span class='boldannounce'>You either took too long or chose not to change. Alrighty. Remember, you have 90 seconds from spawn to get to a mirror and still do it if you wish.</span>")
-			return

code/modules/projectiles/ammunition/energy/stun.dm

@@ -13,7 +13,7 @@
 	e_cost = 100
 
 /obj/item/ammo_casing/energy/electrode/hos
-	e_cost = 200
+	e_cost = 100
 
 /obj/item/ammo_casing/energy/electrode/old
 	e_cost = 1000

code/modules/projectiles/guns/energy/energy_gun.dm

@@ -54,6 +54,7 @@
 	name = "\improper X-01 MultiPhase Energy Gun"
 	desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
 	icon_state = "hoslaser"
+	cell_type = /obj/item/stock_parts/cell{charge = 1600; maxcharge = 1600; chargerate = 160}
 	force = 10
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
 	ammo_x_offset = 4

code/modules/vending/wardrobes.dm

@@ -52,10 +52,13 @@
 					/obj/item/clothing/under/rank/medical/blue = 2,
 					/obj/item/clothing/under/rank/medical/green = 2,
 					/obj/item/clothing/under/rank/medical/purple = 2,
+					/obj/item/clothing/under/rank/medical/emt = 5,
+					/obj/item/clothing/under/rank/medical/emt/skirt = 5,
 					/obj/item/clothing/under/rank/medical = 5,
 					/obj/item/clothing/suit/toggle/labcoat = 5,
 					/obj/item/clothing/suit/toggle/labcoat/emt = 5,
 					/obj/item/clothing/shoes/sneakers/white = 5,
+					/obj/item/clothing/shoes/sneakers/blue = 5,
 					/obj/item/clothing/head/soft/emt = 5,
 					/obj/item/clothing/suit/apron/surgical = 3,
 					/obj/item/clothing/mask/surgical = 5)