Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.…

…T-Station-13

code/__DEFINES/traits.dm

@@ -1,4 +1,5 @@
 #define SIGNAL_TRAIT(trait_ref) "trait [trait_ref]"
+#define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]"
 
 // trait accessor defines
 #define ADD_TRAIT(target, trait, source) \
@@ -59,6 +60,30 @@
 				};\
 		}\
 	} while (0)
+
+#define REMOVE_TRAITS_IN(target, sources) \
+	do { \
+		var/list/_L = target.status_traits; \
+		var/list/_S = sources; \
+		if (sources && !islist(sources)) { \
+			_S = list(sources); \
+		} else { \
+			_S = sources\
+		}; \
+		if (_L) { \
+			for (var/_T in _L) { \
+				_L[_T] -= _S;\
+				if (!length(_L[_T])) { \
+					_L -= _T; \
+					SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T)); \
+					}; \
+				};\
+			if (!length(_L)) { \
+				target.status_traits = null\
+			};\
+		}\
+	} while (0)
+
 #define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE)
 #define HAS_TRAIT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (source in target.status_traits[trait]) : FALSE) : FALSE)
 #define HAS_TRAIT_FROM_ONLY(target, trait, source) (\
@@ -247,6 +272,12 @@
 #define TRAIT_NO_STAMINA_REGENERATION					"block_stamina_regen" /// Prevents stamina regeneration
 #define TRAIT_ARMOR_BROKEN		"armor_broken" //acts as if you are wearing no clothing when taking damage, does not affect non-clothing sources of protection
 #define TRAIT_IWASBATONED "iwasbatoned" //some dastardly fellow has struck you with a baton and thought to use another to strike you again, the rogue
+//Given by social anxiety quirk
+#define TRAIT_ANXIOUS		"anxious"
+/// Trait granted by lipstick
+#define LIPSTICK_TRAIT		"lipstick_trait"
+/// Blowing kisses that actually do damage to the victim
+#define TRAIT_KISS_OF_DEATH		"kiss_of_death"
 /// forces update_density to make us not dense
 #define TRAIT_LIVING_NO_DENSITY			"living_no_density"
 /// forces us to not render our overlays

code/__SPLURTCODE/DEFINES/dcs/signals.dm

@@ -19,3 +19,6 @@
  * Used by signals for determining when genitals have been updated
 */
 #define COMSIG_MOB_UPDATE_GENITALS "mob_genitals_updated"
+
+///called on [/obj/item] AFTER unequip from base of [mob/proc/doUnEquip]: (force, atom/newloc, no_move, invdrop, silent)
+#define COMSIG_ITEM_POST_UNEQUIP "item_post_unequip"

code/_globalvars/traits.dm

@@ -139,6 +139,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
 		"TRAIT_VOIDSTORM_IMMUNE" = TRAIT_VOIDSTORM_IMMUNE,
 		"TRAIT_WEATHER_IMMUNE" = TRAIT_WEATHER_IMMUNE,
+		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
+		"TRAIT_ANXIOUS" = TRAIT_ANXIOUS,
 		"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
 		"TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE, //unable to use mechs. Given to Ash Walkers
 		),

code/controllers/subsystem/shuttle.dm

@@ -5,6 +5,7 @@ SUBSYSTEM_DEF(shuttle)
 	wait = 10
 	init_order = INIT_ORDER_SHUTTLE
 	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // Splurt edit: Add RUNLEVEL_POSTGAME to let shuttles move after round is over.
 
 	var/list/mobile = list()
 	var/list/stationary = list()

code/datums/mood_events/generic_positive_events.dm

@@ -263,6 +263,11 @@
 	mood_change = 5
 	timeout = 3 MINUTES
 
+/datum/mood_event/kiss
+	description = span_nicegreen("Кто-то поцеловал меня. Должно быть, я настоящая находка!\n")
+	mood_change = 4.5
+	timeout = 2 MINUTES
+
 /datum/mood_event/hide_in_box
 	description = "<span class='nicegreen'>В коробочке на удивление приятно</span>\n"
 	mood_change = 3
@@ -271,4 +276,3 @@
 /datum/mood_event/to_awoo
 	description = "<span class='nicegreen'>Обожаю выть!</span>\n"
 	mood_change = 2
-	timeout = 2 MINUTES

code/datums/traits/negative.dm

@@ -342,6 +342,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 	gain_text = "<span class='danger'>Вы начинаете волноваться о своих словах.</span>"
 	lose_text = "<span class='notice'>Вам становится легче говорить.</span>" //if only it were that easy!
 	medical_record_text = "Пациент предпочитает избегать социальных взаимодействий."
+	mob_trait = TRAIT_ANXIOUS
 	var/dumb_thing = TRUE
 	processing_quirk = TRUE
 

code/game/objects/items/cosmetics.dm

@@ -7,6 +7,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	var/colour = "red"
 	var/open = FALSE
+	/// A trait that's applied while someone has this lipstick applied, and is removed when the lipstick is removed
 	var/lipstick_trait
 
 /obj/item/lipstick/purple
@@ -39,7 +40,7 @@
 
 /obj/item/lipstick/attack_self(mob/user)
 	cut_overlays()
-	to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
+	to_chat(user, span_notice("You twist \the [src] [open ? "closed" : "open"]."))
 	open = !open
 	if(open)
 		var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color")
@@ -50,60 +51,53 @@
 		icon_state = "lipstick"
 
 /obj/item/lipstick/attack(mob/M, mob/user)
-	if(!open)
+	if(!open || !ismob(M))
 		return
 
-	if(!ismob(M))
+	if(!ishuman(M))
+		to_chat(user, span_warning("Where are the lips on that?"))
 		return
 
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.is_mouth_covered())
-			to_chat(user, "<span class='warning'>Remove [ H == user ? "your" : "[H.ru_ego()]" ] mask!</span>")
-			return
-		if(H.lip_style)	//if they already have lipstick on
-			to_chat(user, "<span class='warning'>You need to wipe off the old lipstick first!</span>")
-			return
-		if(H == user)
-			user.visible_message("<span class='notice'>[user] does [user.ru_ego()] lips with \the [src].</span>", \
-								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
-			H.lip_style = "lipstick"
-			H.lip_color = colour
-			H.update_body()
-		else
-			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
-								 "<span class='notice'>You begin to apply \the [src] on [H]'s lips...</span>")
-			if(do_after(user, 20, target = H))
-				user.visible_message("[user] does [H]'s lips with \the [src].", \
-									 "<span class='notice'>You apply \the [src] on [H]'s lips.</span>")
-				H.lip_style = "lipstick"
-				H.lip_color = colour
-				H.update_body()
-	else
-		to_chat(user, "<span class='warning'>Where are the lips on that?</span>")
+	var/mob/living/carbon/human/target = M
+	if(target.is_mouth_covered())
+		to_chat(user, span_warning("Remove [ target == user ? "your" : "[target.p_their()]" ] mask!"))
+		return
+	if(target.lip_style)	//if they already have lipstick on
+		to_chat(user, span_warning("You need to wipe off the old lipstick first!"))
+		return
+
+	if(target == user)
+		user.visible_message(span_notice("[user] does [user.p_their()] lips with \the [src]."), \
+			span_notice("You take a moment to apply \the [src]. Perfect!"))
+		target.update_lips("lipstick", colour, lipstick_trait)
+		return
+
+	user.visible_message(span_warning("[user] begins to do [target]'s lips with \the [src]."), \
+		span_notice("You begin to apply \the [src] on [target]'s lips..."))
+	if(!do_after(user, 2 SECONDS, target = target))
+		return
+	user.visible_message(span_notice("[user] does [target]'s lips with \the [src]."), \
+		span_notice("You apply \the [src] on [target]'s lips."))
+	target.update_lips("lipstick", colour, lipstick_trait)
 
 //you can wipe off lipstick with paper!
 /obj/item/paper/attack(mob/M, mob/user)
-	if(user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
-		if(!ismob(M))
-			return
+	if(user.zone_selected != BODY_ZONE_PRECISE_MOUTH || !ishuman(M))
+		return ..()
 
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H == user)
-				to_chat(user, "<span class='notice'>You wipe off the lipstick with [src].</span>")
-				H.lip_style = null
-				H.update_body()
-			else
-				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
-								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick...</span>")
-				if(do_after(user, 10, target = H))
-					user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \
-										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
-					H.lip_style = null
-					H.update_body()
-	else
-		..()
+	var/mob/living/carbon/human/target = M
+	if(target == user)
+		to_chat(user, span_notice("You wipe off the lipstick with [src]."))
+		target.clean_lips()
+		return
+
+	user.visible_message(span_warning("[user] begins to wipe [target]'s lipstick off with \the [src]."), \
+		span_notice("You begin to wipe off [target]'s lipstick..."))
+	if(!do_after(user, 10, target = target))
+		return
+	user.visible_message(span_notice("[user] wipes [target]'s lipstick off with \the [src]."), \
+		span_notice("You wipe off [target]'s lipstick."))
+	target.clean_lips()
 
 /obj/item/razor
 	name = "electric razor"
@@ -114,7 +108,7 @@
 	w_class = WEIGHT_CLASS_TINY
 
 /obj/item/razor/suicide_act(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user] begins shaving себя without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	shave(user, BODY_ZONE_PRECISE_MOUTH)
 	shave(user, BODY_ZONE_HEAD)//doesnt need to be BODY_ZONE_HEAD specifically, but whatever
 	return BRUTELOSS
@@ -155,18 +149,18 @@
 					return
 
 				if(H == user) //shaving yourself
-					user.visible_message("[user] starts to shave [user.ru_ego()] facial hair with [src].", \
-										 "<span class='notice'>You take a moment to shave your facial hair with [src]...</span>")
+					user.visible_message("[user] starts to shave [user.p_their()] facial hair with [src].", \
+										"<span class='notice'>You take a moment to shave your facial hair with [src]...</span>")
 					if(do_after(user, 50, target = H))
-						user.visible_message("[user] shaves [user.ru_ego()] facial hair clean with [src].", \
-											 "<span class='notice'>You finish shaving with [src]. Fast and clean!</span>")
+						user.visible_message("[user] shaves [user.p_their()] facial hair clean with [src].", \
+											"<span class='notice'>You finish shaving with [src]. Fast and clean!</span>")
 						shave(H, location)
 				else
 					user.visible_message("<span class='warning'>[user] tries to shave [H]'s facial hair with [src].</span>", \
-										 "<span class='notice'>You start shaving [H]'s facial hair...</span>")
+										"<span class='notice'>You start shaving [H]'s facial hair...</span>")
 					if(do_after(user, 50, target = H))
 						user.visible_message("<span class='warning'>[user] shaves off [H]'s facial hair with [src].</span>", \
-											 "<span class='notice'>You shave [H]'s facial hair clean off.</span>")
+											"<span class='notice'>You shave [H]'s facial hair clean off.</span>")
 						shave(H, location)
 
 		else if(location == BODY_ZONE_HEAD)
@@ -185,20 +179,20 @@
 					return
 
 				if(H == user) //shaving yourself
-					user.visible_message("[user] starts to shave [user.ru_ego()] head with [src].", \
-										 "<span class='notice'>You start to shave your head with [src]...</span>")
+					user.visible_message("[user] starts to shave [user.p_their()] head with [src].", \
+										"<span class='notice'>You start to shave your head with [src]...</span>")
 					if(do_after(user, 5, target = H))
-						user.visible_message("[user] shaves [user.ru_ego()] head with [src].", \
-											 "<span class='notice'>You finish shaving with [src].</span>")
+						user.visible_message("[user] shaves [user.p_their()] head with [src].", \
+											"<span class='notice'>You finish shaving with [src].</span>")
 						shave(H, location)
 				else
 					var/turf/H_loc = H.loc
 					user.visible_message("<span class='warning'>[user] tries to shave [H]'s head with [src]!</span>", \
-										 "<span class='notice'>You start shaving [H]'s head...</span>")
+										"<span class='notice'>You start shaving [H]'s head...</span>")
 					if(do_after(user, 50, target = H))
 						if(H_loc == H.loc)
 							user.visible_message("<span class='warning'>[user] shaves [H]'s head bald with [src]!</span>", \
-												 "<span class='notice'>You shave [H]'s head bald.</span>")
+												"<span class='notice'>You shave [H]'s head bald.</span>")
 							shave(H, location)
 		else
 			..()