Merge remote-tracking branch 'upstream/master'

code/__defines/chat.dm

@@ -11,6 +11,7 @@
 #define MESSAGE_TYPE_SYSTEM "system"
 #define MESSAGE_TYPE_LOCALCHAT "localchat"
 #define MESSAGE_TYPE_NPCEMOTE "npcemote"
+#define MESSAGE_TYPE_MULTIZCHAT "multizsay"
 #define MESSAGE_TYPE_PLOCALCHAT "plocalchat"
 #define MESSAGE_TYPE_HIVEMIND "hivemind"
 #define MESSAGE_TYPE_RADIO "radio"

code/datums/outfits/jobs/civilian_vr.dm

@@ -22,3 +22,5 @@
 
 /decl/hierarchy/outfit/job/assistant/entrepreneur
 	id_type = /obj/item/weapon/card/id/civilian/entrepreneur
+	l_hand = /obj/item/device/ticket_printer/train
+

code/game/machinery/computer/computer.dm

@@ -9,6 +9,9 @@
 	idle_power_usage = 300
 	active_power_usage = 300
 	blocks_emissive = FALSE
+	var/climbable = TRUE
+	var/list/climbers
+	var/climb_delay = 3.5 SECONDS
 	var/processing = 0
 
 	var/icon_keyboard = "generic_key"
@@ -22,6 +25,8 @@
 	. = ..()
 	power_change()
 	update_icon()
+	if(climbable)
+		verbs += /obj/structure/proc/climb_on
 
 /obj/machinery/computer/process()
 	if(stat & (NOPOWER|BROKEN))
@@ -132,3 +137,86 @@
 			return
 		attack_hand(user)
 		return
+
+/obj/machinery/computer/proc/climb_on()
+	set name = "Climb structure"
+	set desc = "Climbs onto a structure."
+	set category = "Object"
+	set src in oview(1)
+
+	do_climb(usr)
+
+/obj/machinery/computer/MouseDrop_T(mob/target, mob/user)
+	var/mob/living/H = user
+	if(istype(H) && can_climb(H) && target == user)
+		do_climb(target)
+	else
+		return ..()
+
+/obj/machinery/computer/proc/can_climb(var/mob/living/user, post_climb_check=0)
+	if (!climbable || !can_touch(user) || (!post_climb_check && (user in climbers)))
+		return 0
+
+	if (!user.Adjacent(src))
+		to_chat(user, "<span class='danger'>You can't climb there, the way is blocked.</span>")
+		return 0
+
+	var/obj/occupied = turf_is_crowded()
+	if(occupied)
+		to_chat(user, "<span class='danger'>There's \a [occupied] in the way.</span>")
+		return 0
+	return 1
+
+/obj/machinery/computer/proc/turf_is_crowded()
+	var/turf/T = get_turf(src)
+	if(!T || !istype(T))
+		return "empty void"
+	if(T.density)
+		return T
+	for(var/obj/O in T.contents)
+		if(istype(O,/obj/machinery/computer))
+			var/obj/machinery/computer/S = O
+			if(S.climbable) continue
+		if(O && O.density && !(O.flags & ON_BORDER)) //ON_BORDER structures are handled by the Adjacent() check.
+			return O
+	return 0
+
+/obj/machinery/computer/proc/do_climb(var/mob/living/user)
+	if (!can_climb(user))
+		return
+
+	usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
+	LAZYDISTINCTADD(climbers, user)
+
+	if(!do_after(user,(issmall(user) ? climb_delay * 0.6 : climb_delay)))
+		LAZYREMOVE(climbers, user)
+		return
+
+	if (!can_climb(user, post_climb_check=1))
+		LAZYREMOVE(climbers, user)
+		return
+
+	usr.forceMove(climb_to(user))
+
+	if (get_turf(user) == get_turf(src))
+		usr.visible_message("<span class='warning'>[user] climbs onto \the [src]!</span>")
+	LAZYREMOVE(climbers, user)
+
+/obj/machinery/computer/proc/climb_to(var/mob/living/user)
+	return get_turf(src)
+
+
+/obj/machinery/computer/proc/can_touch(var/mob/user)
+	if (!user)
+		return 0
+	if(!Adjacent(user))
+		return 0
+	if (user.restrained() || user.buckled)
+		to_chat(user, "<span class='notice'>You need your hands and legs free for this.</span>")
+		return 0
+	if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened)
+		return 0
+	if (isAI(user))
+		to_chat(user, "<span class='notice'>You need hands for this.</span>")
+		return 0
+	return 1

code/modules/emotes/emote_mob.dm

@@ -222,6 +222,8 @@
 				if(M)
 					if(isobserver(M))
 						message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
+					if(usr && usr.client && M && !(get_z(usr) == get_z(M)))
+						message = "<span class='multizsay'>[message]</span>"
 					M.show_message(message, m_type)
 					M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), (m_type == AUDIBLE_MESSAGE))
 

code/modules/mob/hear_say.dm

@@ -145,6 +145,8 @@
 		message = "<span class='game say'>[message]</span>"
 		if(speaker && !speaker.client)
 			message = "<span class='npcsay'>[message]</span>"
+		else if(speaker && !(get_z(src) == get_z(speaker)))
+			message = "<span class='multizsay'>[message]</span>"
 		to_chat(src, message)
 	else if(teleop)
 		to_chat(teleop, "<span class='game say'>[create_text_tag("body", "BODY:", teleop.client)][message]</span>")
@@ -159,6 +161,8 @@
 		message = "<span class='game say'>[message]</span>"
 		if(speaker && !speaker.client)
 			message = "<span class='npcsay'>[message]</span>"
+		else if(speaker && !(get_z(src) == get_z(speaker)))
+			message = "<span class='multizsay'>[message]</span>"
 		to_chat(src, message)
 	else if(teleop)
 		to_chat(teleop, "<span class='game say'>[create_text_tag("body", "BODY:", teleop.client)][message]</span>")
@@ -333,4 +337,6 @@
 	var/rendered = "<span class='game say'><span class='name'>[name]</span> [message]</span>"
 	if(!speaker.client)
 		rendered = "<span class='npcsay'>[rendered]</span>"
+	else if(speaker && !(get_z(src) == get_z(speaker)))
+		rendered = "<span class='multizsay'>[message]</span>"
 	to_chat(src, rendered)

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

@@ -548,3 +548,9 @@
 		if(src.wear_mask)						//if the mob is not human, it cleans the mask without asking for bitflags
 			if(src.wear_mask.clean_blood())
 				src.update_inv_wear_mask(0)
+
+/mob/living/carbon/proc/food_preference(var/allergen_type) //RS edit
+
+	if(allergen_type in species.food_preference)
+		return species.food_preference_bonus
+	return 0

code/modules/mob/living/carbon/human/species/species_vr.dm

@@ -42,6 +42,8 @@
 	var/can_climb = FALSE
 	var/climbing_delay = 1.5	// We climb with a quarter delay
 
+	var/list/food_preference = list() //RS edit
+	var/food_preference_bonus = 0
 
 /datum/species/proc/give_numbing_bite() //Holy SHIT this is hacky, but it works. Updating a mob's attacks mid game is insane.
 	unarmed_attacks = list()