Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290

modular_citadel/code/modules/admin/admin.dm

@@ -15,7 +15,7 @@
 		return
 
 	to_chat(M, "<span class='warning bold reallybig'>Man up, and deal with it.</span><br><span class='warning big'>Move on.</span>")
-	M.playsound_local(M, 'modular_citadel/sound/misc/manup.ogg', 50, FALSE, pressure_affected = FALSE)
+	M.playsound_local(M, 'sound/voice/manup.ogg', 50, FALSE, pressure_affected = FALSE)
 
 	log_admin("Man up: [key_name(usr)] told [key_name(M)] to man up")
 	var/message = "<span class='adminnotice'>[key_name_admin(usr)] told [key_name_admin(M)] to man up.</span>"
@@ -32,7 +32,7 @@
 
 	to_chat(world, "<span class='warning bold reallybig'>Man up, and deal with it.</span><br><span class='warning big'>Move on.</span>")
 	for(var/mob/M in GLOB.player_list)
-		M.playsound_local(M, 'modular_citadel/sound/misc/manup.ogg', 50, FALSE, pressure_affected = FALSE)
+		M.playsound_local(M, 'sound/voice/manup.ogg', 50, FALSE, pressure_affected = FALSE)
 
 	log_admin("Man up global: [key_name(usr)] told everybody to man up")
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] told everybody to man up.</span>")

modular_citadel/code/modules/client/loadout/suit.dm

@@ -64,6 +64,64 @@
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat
 
+/* Commented out until it is "balanced"
+/datum/gear/coat/sec
+	name = "Security winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/security
+	restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer") // Reserve it to the Security Departement
+*/
+
+/datum/gear/coat/med
+	name = "Medical winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/medical
+	restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer
+	
+/* Commented out until there is a Chemistry Winter Coat
+/datum/gear/coat/med/chem
+	name = "Chemistry winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry
+	restricted_roles = list("Chief Medical Officer", "Chemist") // Reserve it to Chemists and their boss, the Chief Medical Officer
+*/	
+
+/datum/gear/coat/sci
+	name = "Science winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/science
+	restricted_roles = list("Research Director", "Scientist", "Roboticist") // Reserve it to the Science Departement
+	
+/datum/gear/coat/eng
+	name = "Engineering winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/engineering
+	restricted_roles = list("Chief Engineer", "Station Engineer") // Reserve it to Station Engineers and their boss, the Chief Engineer
+	
+/datum/gear/coat/eng/atmos
+	name = "Atmospherics winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+	restricted_roles = list("Chief Engineer", "Atmospheric Technician") // Reserve it to Atmos Techs and their boss, the Chief Engineer
+	
+/datum/gear/coat/hydro
+	name = "Hydroponics winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/hydro
+	restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel
+	
+/datum/gear/coat/cargo
+	name = "Cargo winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/cargo
+	restricted_roles = list("Quartermaster", "Cargo Technician") // Reserve it to Cargo Techs and their boss, the Quartermaster
+	
+/datum/gear/coat/miner
+	name = "Mining winter coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/hooded/wintercoat/miner
+	restricted_roles = list("Quartermaster", "Shaft Miner") // Reserve it to Miners and their boss, the Quartermaster
+
 /datum/gear/militaryjacket
 	name = "Military Jacket"
 	category = SLOT_WEAR_SUIT

modular_citadel/code/modules/clothing/glasses/phantomthief.dm

@@ -27,7 +27,7 @@
 	if(istype(user) && combatmodestate && world.time >= nextadrenalinepop)
 		nextadrenalinepop = world.time + 5 MINUTES
 		user.reagents.add_reagent("syndicateadrenals", 5)
-		user.playsound_local(user, 'modular_citadel/sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
+		user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
 
 /obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot)
 	. = ..()

modular_citadel/code/modules/clothing/neck.dm

@@ -15,7 +15,7 @@
 
 /datum/action/item_action/zanderlocket/Trigger()
 	new/obj/effect/temp_visual/souldeath(owner.loc, owner)
-	playsound(owner, 'modular_citadel/sound/misc/souldeath.ogg', 100, FALSE)
+	playsound(owner, 'sound/misc/souldeath.ogg', 100, FALSE)
 
 
 /obj/item/clothing/neck/undertale/Initialize()

modular_citadel/code/modules/mob/living/carbon/carbon.dm

@@ -29,9 +29,9 @@
 	if(voremode)
 		toggle_vore_mode()
 	if(combatmode)
-		playsound_local(src, 'modular_citadel/sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!
+		playsound_local(src, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!
 	else
-		playsound_local(src, 'modular_citadel/sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above!
+		playsound_local(src, 'sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above!
 	if(client)
 		client.show_popup_menus = !combatmode // So we can right-click for alternate actions and all that other good shit. Also moves examine to shift+rightclick to make it possible to attack while sprinting
 	if(hud_used && hud_used.static_inventory)

modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm

@@ -24,9 +24,9 @@
 	sprinting = !sprinting
 	if(!resting && m_intent == MOVE_INTENT_RUN && canmove)
 		if(sprinting)
-			playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+			playsound_local(src, 'sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
 		else
-			playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+			playsound_local(src, 'sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
 	if(hud_used && hud_used.static_inventory)
 		for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
 			selector.insert_witty_toggle_joke_here(src)

modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -19,11 +19,11 @@
 	sprinting = shutdown ? FALSE : !sprinting
 	if(!resting && canmove)
 		if(sprinting)
-			playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+			playsound_local(src, 'sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
 		else
 			if(shutdown)
 				playsound_local(src, 'sound/effects/light_flicker.ogg', 50, FALSE, pressure_affected = FALSE)
-			playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+			playsound_local(src, 'sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
 	if(hud_used && hud_used.static_inventory)
 		for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
 			selector.insert_witty_toggle_joke_here(src)

modular_citadel/code/modules/projectiles/guns/pumpenergy.dm

@@ -75,9 +75,9 @@
 /obj/item/gun/energy/pumpaction/proc/pump(mob/M)	//pumping proc. Checks if the gun is empty and plays a different sound if it is.
 	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
 	if(cell.charge < shot.e_cost)
-		playsound(M, 'modular_citadel/sound/weapons/laserPumpEmpty.ogg', 100, 1)	//Ends with three beeps made from highly processed knife honing noises
+		playsound(M, 'sound/weapons/laserPumpEmpty.ogg', 100, 1)	//Ends with three beeps made from highly processed knife honing noises
 	else
-		playsound(M, 'modular_citadel/sound/weapons/laserPump.ogg', 100, 1)		//Ends with high pitched charging noise
+		playsound(M, 'sound/weapons/laserPump.ogg', 100, 1)		//Ends with high pitched charging noise
 	recharge_newshot() //try to charge a new shot
 	update_icon()
 	return 1
@@ -152,14 +152,14 @@
 	e_cost = 150
 	pellets = 4
 	variance = 30
-	fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg'
+	fire_sound = 'sound/weapons/ParticleBlaster.ogg'
 	select_name  = "disable"
 
 /obj/item/ammo_casing/energy/disabler/slug
 	projectile_type = /obj/item/projectile/beam/disabler/slug
 	select_name  = "overdrive"
 	e_cost = 200
-	fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg'
+	fire_sound = 'sound/weapons/LaserSlugv3.ogg'
 
 /obj/item/ammo_casing/energy/laser/pump
 	projectile_type = /obj/item/projectile/beam/weak
@@ -167,12 +167,12 @@
 	select_name = "kill"
 	pellets = 3
 	variance = 15
-	fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg'
+	fire_sound = 'sound/weapons/ParticleBlaster.ogg'
 
 /obj/item/ammo_casing/energy/electrode/pump
 	projectile_type = /obj/item/projectile/energy/electrode/pump
 	select_name = "stun"
-	fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg'
+	fire_sound = 'sound/weapons/LaserSlugv3.ogg'
 	e_cost = 300
 	pellets = 3
 	variance = 20

modular_citadel/code/modules/projectiles/guns/toys.dm

@@ -39,7 +39,7 @@
 	projectile_type = /obj/item/projectile/beam/lasertag/wavemotion
 	select_name = "overdrive"
 	e_cost = 300
-	fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg'
+	fire_sound = 'sound/weapons/LaserSlugv3.ogg'
 
 /obj/item/ammo_casing/energy/laser/dispersal
 	projectile_type = /obj/item/projectile/beam/lasertag/dispersal
@@ -47,7 +47,7 @@
 	pellets = 5
 	variance = 25
 	e_cost = 200
-	fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg'
+	fire_sound = 'sound/weapons/ParticleBlaster.ogg'
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //TOY REVOLVER

modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm

@@ -94,6 +94,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				if(!SM.mind) //Something went wrong, use alt mechanics
 					return ..()
 				SM.mind.enslave_mind_to_creator(M)
+				SM.mind.store_memory(M.mind.memory)
 
 				//If they're a zombie, they can try to negate it with this.
 				//I seriously wonder if anyone will ever use this function.

modular_citadel/code/modules/vehicles/secway.dm

@@ -1,54 +0,0 @@
-/obj/vehicle/ridden/secway
-	var/chargemax = 150
-	var/chargerate = 0.35
-	var/charge = 150
-	var/chargespeed = 1
-	var/normalspeed = 2
-	var/last_tick = 0
-	var/list/progressbars_by_rider = list()
-
-/obj/vehicle/ridden/secway/Initialize()
-	. = ..()
-	START_PROCESSING(SSfastprocess, src)
-
-/obj/vehicle/ridden/secway/process()
-	var/diff = world.time - last_tick
-	var/regen = chargerate * diff
-	charge = CLAMP(charge + regen, 0, chargemax)
-	last_tick = world.time
-
-/obj/vehicle/ridden/secway/relaymove(mob/user, direction)
-	var/new_speed = normalspeed
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.sprinting && charge)
-			charge--
-			new_speed = chargespeed
-	var/datum/component/riding/D = GetComponent(/datum/component/riding)
-	D.vehicle_move_delay = new_speed
-	for(var/i in progressbars_by_rider)
-		var/datum/progressbar/B = progressbars_by_rider[i]
-		B.update(charge)
-	return ..()
-
-/obj/vehicle/ridden/secway/buckle_mob(mob/living/M, force, check_loc)
-	. = ..(M, force, check_loc)
-	if(.)
-		if(progressbars_by_rider[M])
-			qdel(progressbars_by_rider[M])
-		var/datum/progressbar/D = new(M, chargemax, src)
-		D.update(charge)
-		progressbars_by_rider[M] = D
-
-/obj/vehicle/ridden/secway/unbuckle_mob(mob/living/M, force)
-	. = ..(M, force)
-	if(.)
-		qdel(progressbars_by_rider[M])
-		progressbars_by_rider -= M
-
-/obj/vehicle/ridden/secway/Destroy()
-	for(var/i in progressbars_by_rider)
-		qdel(progressbars_by_rider[i])
-	progressbars_by_rider.Cut()
-	STOP_PROCESSING(SSfastprocess, src)
-	return ..()