Merge remote-tracking branch 'upstream/master' into real-tgmc-particle

_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm

@@ -1722,7 +1722,7 @@
 /turf/open/floor/ms13/metal/grate,
 /area/ms13/underground/sewer)
 "amL" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /turf/open/floor/ms13/metal/grate,
@@ -2764,7 +2764,7 @@
 	},
 /area/ms13/underground/sewer)
 "avL" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	pixel_y = 15
 	},
 /turf/open/floor/ms13/tile/navy,
@@ -4276,7 +4276,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/underground/underground_town)
 "aJn" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 1
 	},
 /turf/open/floor/ms13/metal/grate,
@@ -4764,7 +4764,7 @@
 /turf/open/floor/ms13/concrete/industrial,
 /area/ms13/town)
 "aOf" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /turf/open/floor/ms13/metal/grate,
@@ -5226,7 +5226,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/ncr/building)
 "aSp" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8;
 	pixel_x = -6
 	},
@@ -8817,7 +8817,7 @@
 /turf/open/floor/ms13/sewer,
 /area/ms13/underground/sewer)
 "ioP" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/structure/ms13/rug/mat/rubber/single,
@@ -9970,6 +9970,7 @@
 /area/ms13/underground/sewer)
 "ltS" = (
 /obj/effect/spawner/random/ms13/gun/lowrandom,
+/obj/structure/ms13/trash/food/misc,
 /turf/open/floor/ms13/concrete,
 /area/ms13/town)
 "luy" = (

code/controllers/subsystem/explosions.dm

@@ -515,7 +515,7 @@ SUBSYSTEM_DEF(explosions)
  * - [creaking_sound][/sound]: The sound that plays when the station creaks during the explosion.
  * - [hull_creaking_sound][/sound]: The sound that plays when the station creaks after the explosion.
  */
-/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx("explosion_creaking")), hull_creaking_sound = sound(get_sfx("hull_creaking")))
+/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound(get_sfx("explosion_distant")), sound/echo_sound = sound(get_sfx("explosion_far")), sound/creaking_sound = sound(get_sfx("explosion_far")), hull_creaking_sound = sound(get_sfx("explosion_far"))) // MOJAVE SUN EDIT - ORIGINAL IS (turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx("explosion_creaking")), hull_creaking_sound = sound(get_sfx("hull_creaking")))
 	var/frequency = get_rand_frequency()
 	var/blast_z = epicenter.z
 	if(isnull(creaking)) // Autoset creaking.
@@ -535,7 +535,7 @@ SUBSYSTEM_DEF(explosions)
 			distance = 0
 		var/base_shake_amount = sqrt(near_distance / (distance + 1))
 
-		if(distance <= round(near_distance + world.view - 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls)
+		if(distance <= round(near_distance + world.view + 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls) // MOJAVE SUN EDIT - ORIGINAL IS if(distance <= round(near_distance + world.view - 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls)
 			listener.playsound_local(epicenter, null, 100, TRUE, frequency, S = near_sound)
 			if(base_shake_amount > 0)
 				shake_camera(listener, NEAR_SHAKE_DURATION, clamp(base_shake_amount, 0, NEAR_SHAKE_CAP))

code/game/sound.dm

@@ -210,8 +210,16 @@ distance_multiplier - Can be used to multiply the distance at which the sound is
 		switch(soundin)
 			if ("shatter")
 				soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
+			// MOJAVE SUN EDIT BEGIN
 			if ("explosion")
-				soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg')
+				soundin = pick('mojave/sound/ms13effects/explosion_1.ogg', 'mojave/sound/ms13effects/explosion_2.ogg', 'mojave/sound/ms13effects/explosion_3.ogg')
+				//soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg')
+			if ("explosion_distant")
+				soundin = pick('mojave/sound/ms13effects/explosion_distant_1.ogg', 'mojave/sound/ms13effects/explosion_distant_2.ogg', 'mojave/sound/ms13effects/explosion_distant_3.ogg')
+			if ("explosion_far")
+				soundin = pick('mojave/sound/ms13effects/explosion_far_1.ogg', 'mojave/sound/ms13effects/explosion_far_2.ogg', 'mojave/sound/ms13effects/explosion_far_3.ogg')
+				//	soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg')
+			// MOJAVE SUN EDIT END
 			if ("explosion_creaking")
 				soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg')
 			if ("hull_creaking")

mojave/code/datums/documents.dm

@@ -329,3 +329,15 @@
 		Unfortunately, that entails we'll have to pull you back a shift and you'll do opening. Nothing too drastic should change, other than it being sun-up when you arrive. When we next see each other, I can give you the keys for lockup. There's a few of them, actually. That was also mandated...\
 		<br><br>\
 		So... Yeah. If you do end up coming in on the twenty-third and see this before I can snag you up or Rich got to you first, just hang around and work as usual, we'll get together to talk a bit more about the new protocol. -Rebecca."
+
+//// DROUGHT SPECIFIC ////
+
+/datum/terminal/document/drought_junkyard_warn //Drought junkyard sentry warning
+	title = "DO NOT ENTER"
+	content = "Jacobsen fucked it up big time. That giant hunk of prewar kickass was hardly on the hoist for all of five fucking minutes before the moron pressed on the wrong part of it. I didn't even get to see him before he disappeared into a cloud of red mist.\
+		<br>\
+		I managed to contain it, but Nick took some shots and I don't think he's going to make it. The sentry bot is active in there- If you end up making it back, I pray to god you read this message. We can't stay here.\
+		<br>\
+		We'll be meeting up in the old Sheriff's station. You need to come over with us, take a right when you exit the junkyard, hang a left at the first road and keep walking. We'll probably be out front waiting once we've cleared it out a bit. It's just us two, now.\
+		<br>\
+		Moral of the story is... Don't play around with military tech. It's not worth it."

mojave/code/modules/jobs/job_types/rangers/doctor.dm

@@ -9,6 +9,8 @@
 
 	display_order = JOB_DISPLAY_ORDER_MS13_RANGERDOCTOR
 
+	mind_traits = list(TRAIT_MEDICAL_TRAINING)
+
 /datum/outfit/job/ms13/ranger/doctor
 	name = "_Desert Ranger Doctor"
 	jobtype = 	 /datum/job/ms13/ranger/rdoctor

mojave/code/modules/jobs/job_types/town_drought/clinician.dm

@@ -11,7 +11,7 @@
 
 	display_order = JOB_DISPLAY_ORDER_MS13_CLINICIAN
 
-	mind_traits = list(TRAIT_MEDICAL_TRAINING)
+	mind_traits = list(TRAIT_MEDICAL_TRAINING, TRAIT_DRUGGIE)
 
 /datum/outfit/job/ms13/town_drought/clinician
 	name = "_Barony Clinician"
@@ -25,6 +25,8 @@
 	r_hand =     /obj/item/storage/firstaid/ms13/bag/filled
 	r_pocket =   /obj/item/stack/ms13/currency/cap/hunnedtwentyfive
 	back =       /obj/item/storage/ms13/satchel
+	backpack_contents = list(
+		/obj/item/card/id/ms13/drought_medical=1)
 
 /datum/outfit/job/ms13/town_drought/clinician/pre_equip(mob/living/carbon/human/H)
 	..()

mojave/code/modules/mob/robots/handies.dm

@@ -77,3 +77,4 @@
 	ranged_cooldown = 2 SECONDS
 	casingtype = /obj/item/ammo_casing/energy/ms13/plasma/gutsy
 	projectilesound = 'mojave/sound/ms13weapons/gunsounds/plasrifle/plasma_3.ogg'
+	attack_sound = list('mojave/sound/ms13weapons/meleesounds/ripper_hit1.ogg', 'mojave/sound/ms13weapons/meleesounds/ripper_hit2.ogg')

mojave/effects/ms13_decals.dm

@@ -229,6 +229,24 @@
 /obj/effect/turf_decal/ms13/graffiti/ncr
 	icon_state = "ncr"
 
+/obj/effect/turf_decal/ms13/graffiti/do_not
+	icon_state = "donot"
+
+/obj/effect/turf_decal/ms13/graffiti/death
+	icon_state = "death"
+
+/obj/effect/turf_decal/ms13/graffiti/die_young
+	icon_state = "dieyoung"
+
+/obj/effect/turf_decal/ms13/graffiti/reaper
+	icon_state = "reaper"
+
+/obj/effect/turf_decal/ms13/graffiti/mark
+	icon_state = "mark"
+
+/obj/effect/turf_decal/ms13/graffiti/slumbers
+	icon_state = "slumbers"
+
 /obj/effect/turf_decal/ms13/graffiti/large
 	icon = 'mojave/icons/decals/graffiti64x64.dmi'
 

mojave/items/cards_ids.dm

@@ -306,22 +306,52 @@
 	icon_state = "drought_town"
 	assignment = "Barony Denizen"
 
+/obj/item/card/id/ms13/drought_visa
+	name = "\improper Barony identification papers"
+	desc = "Freshly stamped identification papers for a new citizen of the Barony. The freshness of these papers likely indicate these are for a recent arrival to the Barony."
+	icon_state = "drought_town"
+	assignment = "Barony Migrant"
+
+/obj/item/card/id/ms13/drought_visa/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/card/id/ms13/drought_baron))
+		registered_name = stripped_input(user, "Who do you want to grant these papers to?", , "", MAX_NAME_LEN)
+		to_chat(user, "You scribble [registered_name] for the name on the papers.")
+		update_label()
+	return ..()
+
 /obj/item/card/id/ms13/drought_slave
+	name = "\improper Barony identification papers"
 	desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for labor and maintenance duties included."
 	assignment = "Barony Laborer"
 	icon_state = "drought_town"
 
 /obj/item/card/id/ms13/drought_barkeep
+	name = "\improper Barony identification papers"
 	desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for operation of a dining and drinking establishment within the Barony."
 	assignment = "Barony Barkeep"
 	icon_state = "drought_town"
 
 /obj/item/card/id/ms13/drought_doctor
+	name = "\improper Barony identification papers"
 	desc = "Stamped identification papers for a citizen of the Barony. This has special clearance for operation of a clinic and medical duties within the Barony."
 	assignment = "Barony Clinician"
 	icon_state = "drought_town"
 	access = list(ACCESS_BARONY_DOCTOR)
 
+/obj/item/card/id/ms13/drought_medical
+	name = "\improper Barony identification papers"
+	desc = "Freshly stamped identification papers for a citizen of the Barony. This is specifically designated for individuals assisting the operation of the Barony's clinic."
+	assignment = "Barony Medical Support"
+	icon_state = "drought_town"
+	access = list(ACCESS_BARONY_DOCTOR)
+
+/obj/item/card/id/ms13/drought_medical/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/card/id/ms13/drought_doctor))
+		registered_name = stripped_input(user, "Who do you want to grant these papers to?", , "", MAX_NAME_LEN)
+		to_chat(user, "You scribble [registered_name] for the name on the papers.")
+		update_label()
+	return ..()
+
 /obj/item/card/id/ms13/drought_enforcer
 	name = "enforcer's golden pin"
 	desc = "A gold talon pin, worn by Enforcers of the Baron. An intimidating sight."

mojave/structures/decorative.dm

@@ -844,7 +844,7 @@
 /obj/structure/ms13/trash/glass/cans
 	name = "empty bottles and cans"
 	desc = "Some empty glass bottles and aluminum cans. You just might be able to make something out of this."
-	icon_state = "foodstuff_1"
+	icon_state = "glass_1"
 
 /obj/structure/ms13/trash/glass/cans/Initialize(mapload)
 	. = ..()

mojave/structures/plumbing_decorations.dm

@@ -47,3 +47,9 @@
 	icon_state = "sink"
 	desc = "A sink. This one seems to function well, but there's a gross buildup around the faucet end."
 	dispensedreagent = /datum/reagent/consumable/ms13/water/unfiltered
+
+/obj/machinery/shower/ms13
+	name = "shower"
+	desc = "An old shower, there must still be some water in the tank since it works, but you probably shouldn't leave your mouth open whilst using it."
+	icon = 'mojave/icons/structure/miscellaneous.dmi'
+	icon_state = "shower"