roundstart display tweaks and role spawners

code/controllers/subsystem/ticker.dm

@@ -246,7 +246,7 @@ SUBSYSTEM_DEF(ticker)
 	save_mode(CONFIG_GET(string/gamemode_default))
 
 	if(round_statistics)
-		to_chat_spaced(world, html = FONT_SIZE_BIG(SPAN_ROLE_BODY("<B>Welcome to [round_statistics.round_name]</B>")))
+		to_chat_spaced(world, html = narrate_head("<B>Welcome to [round_statistics.round_name]</B>"))
 
 	supply_controller.process() //Start the supply shuttle regenerating points -- TLE
 

code/game/gamemodes/colonialmarines/colonialmarines.dm

@@ -26,7 +26,7 @@
 	return TRUE
 
 /datum/game_mode/colonialmarines/announce()
-	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = SPAN_ROUNDHEADER("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!"))
+	to_chat_spaced(world, type = MESSAGE_TYPE_SYSTEM, html = narrate_head("The current map is - [SSmapping.configs[GROUND_MAP].map_name]!"))
 
 /datum/game_mode/colonialmarines/get_roles_list()
 	return ROLES_DISTRESS_SIGNAL

code/game/jobs/job/job.dm

@@ -202,24 +202,29 @@
 				account_user.mind.initial_account = generated_account
 	return generated_account
 
-/datum/job/proc/generate_entry_message()
+/datum/job/proc/generate_entry_message(mob/living/carbon/human/H)
 	if(!entry_message_intro)
 		entry_message_intro = "You are the [title]!"
+	to_chat(H, narrate_head(entry_message_intro))
+	if(!entry_message_body)
+		entry_message_body = "You are an unspecified auxiliary role on board the [MAIN_SHIP_NAME]!"
+	to_chat(H, narrate_body(entry_message_body))
 	if(!entry_message_end)
 		entry_message_end = "As the [title] you answer to [supervisors]. Special circumstances may change this!"
-	return "[entry_message_intro]<br>[entry_message_body]<br>[entry_message_end]"
+	to_chat(H, narrate_body(entry_message_body))
+	return
 
 /datum/job/proc/announce_entry_message(mob/living/carbon/human/H, datum/money_account/M, whitelist_status) //The actual message that is displayed to the mob when they enter the game as a new player.
 	set waitfor = 0
 	sleep(10)
 	if(H && H.loc && H.client)
-
+		generate_entry_message(H)
 		//Document syntax cannot have tabs for proper formatting.
 		var/entrydisplay = " \
 			[flags_startup_parameters & ROLE_ADMIN_NOTIFY ? narrate_head("You are playing a job that is important for game progression. If you have to disconnect, please notify the admins via adminhelp.") : ""] \n\
 			[narrate_body("[generate_entry_message(H)]<br>[M ? "Your account number is: <b>[M.account_number]</b>. Your account pin is: <b>[M.remote_access_pin]</b>." : "You do not have a bank account."]")] \n\
 		"
-		to_chat_spaced(H, html = entrydisplay)
+		to_chat_spaced(H, html = narrate_body(entrydisplay))
 
 /datum/job/proc/generate_entry_conditions(mob/living/M, whitelist_status)
 	if (istype(M) && M.client)

code/game/objects/items/misc.dm

@@ -433,14 +433,14 @@
 	icon = 'icons/obj/items/syringe.dmi'
 	icon_state = "stim_5"
 	var/owner_mob
-	var/volume = 25
+	var/volume = 50
 	var/cooldown_time = 0
 	var/cooldown_val = 50
 
 
 /obj/item/stim_injector/update_icon()
 	if(reagents.total_volume > 0)
-		var/num_to_append = floor(reagents.total_volume / 5)
+		var/num_to_append = floor(reagents.total_volume / 10)
 		var/text_to_append = num2text(num_to_append)
 		if(num_to_append > 1)
 			icon_state = "stim_[text_to_append]"
@@ -470,7 +470,7 @@
 	cooldown_time = world.time + cooldown_val
 	playsound(loc, 'sound/items/hypospray.ogg', 60, 1)
 	reagents.reaction(M, INGEST)
-	reagents.trans_to(M, 5)
+	reagents.trans_to(M, 10)
 	user.visible_message("[user] injects [M] with the Super Stimulant!", "You inject [M] with the Super Stimulant!")
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with a SuperStim by [key_name(user)].")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has injected [key_name(M)] with a SuperStim.")

code/modules/gear_presets/xenosurge.dm

@@ -25,8 +25,6 @@
 	gear_preset = /datum/equipment_preset/pve/base
 	entry_message_body = "haha"
 
-
-
 /datum/equipment_preset/pve/base
 	name = "UER Marine Operator"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
@@ -49,6 +47,18 @@
 	new_human.bind_stimpack(injector)
 	new_human.put_in_any_hand_if_possible(injector)
 
+/obj/effect/landmark/start/marine/pve/base/
+	name = JOB_UER_MARINE
+	icon_state = "smartgunner_spawn"
+	job = /datum/job/marine/pve/base
+
+/obj/effect/landmark/start/marine/pve/base/squad1
+	icon_state = "smartgunner_spawn_alpha"
+	squad = SQUAD_MARINE_1
+
+/obj/effect/landmark/start/marine/pve/base/squad2
+	icon_state = "smartgunner_spawn_delta"
+	squad = SQUAD_MARINE_4
 
 /datum/job/marine/pve/point
 	title = JOB_UER_MARINE_POINT
@@ -81,6 +91,20 @@
 	new_human.bind_stimpack(injector)
 	new_human.put_in_any_hand_if_possible(injector)
 
+
+/obj/effect/landmark/start/marine/pve/point/
+	name = JOB_UER_MARINE_POINT
+	icon_state = "spec_spawn"
+	job = /datum/job/marine/pve/point
+
+/obj/effect/landmark/start/marine/pve/point/squad1
+	icon_state = "spec_spawn_alpha"
+	squad = SQUAD_MARINE_1
+
+/obj/effect/landmark/start/marine/pve/point/squad2
+	icon_state = "spec_spawn_delta"
+	squad = SQUAD_MARINE_4
+
 /datum/job/marine/pve/lead
 	title = JOB_UER_MARINE_LEAD
 	total_positions = 2
@@ -111,3 +135,16 @@
 	var/obj/item/stim_injector/injector = new /obj/item/stim_injector(get_turf(new_human))
 	new_human.bind_stimpack(injector)
 	new_human.put_in_any_hand_if_possible(injector)
+
+/obj/effect/landmark/start/marine/pve/lead/
+	name = JOB_UER_MARINE_LEAD
+	icon_state = "leader_spawn"
+	job = /datum/job/marine/pve/lead
+
+/obj/effect/landmark/start/marine/pve/lead/squad1
+	icon_state = "leader_spawn_alpha"
+	squad = SQUAD_MARINE_1
+
+/obj/effect/landmark/start/marine/pve/lead/squad2
+	icon_state = "leader_spawn_delta"
+	squad = SQUAD_MARINE_4

code/modules/reagents/chemistry_reagents/medical.dm

@@ -433,5 +433,5 @@
 	color = "#8ae786"
 	custom_metabolism = AMOUNT_PER_TIME(1, 10)
 	data = 0
-	overdose = 200
-	properties = list(PROPERTY_OMNIPOTENT = 20,PROPERTY_DEFIBRILLATING = 20,PROPERTY_CARDIOSTABILIZING = 10, PROPERTY_PAINKILLING = 5)
+	overdose = 500
+	properties = list(PROPERTY_OMNIPOTENT = 15,PROPERTY_DEFIBRILLATING = 15,PROPERTY_CARDIOSTABILIZING = 10, PROPERTY_PAINKILLING = 5)