Merge pull request #173 from ARF-SS13/butt-ons

Readds the health bar & spaces examine a bit

code/_onclick/hud/_defines.dm

@@ -55,7 +55,7 @@
 #define ui_combat_toggle "WEST+7:16,SOUTH:2"
 #define ui_zonesel "WEST+7:16,SOUTH:3"
 #define ui_crafting	"WEST+6:-15,SOUTH+1:1"
-#define ui_building "WEST+5:-14,SOUTH+1:1"
+#define ui_building "WEST+5:1,SOUTH+1:1"
 #define ui_language_menu "WEST+5:1,SOUTH+1:1"
 
 
@@ -69,7 +69,7 @@
 //#define ui_zonesel "Center+5:2,SOUTH:3:1"
 #define ui_mood 	"Center-1:5,South+1:11"
 #define ui_healthdoll 	"EAST-3:-3,SOUTH:4"
-#define ui_health 	"Center+0:0,South+1:-2"
+#define ui_health 	"Right-3:28,South+2:-18"
 #define ui_stamina "Right-2:27,South+1:+3" // replacing internals button
 #define ui_questbook "CENTER+2:19,SOUTH+1:-12"
 #define ui_questscanner "CENTER+3:21,SOUTH+1:-12"
@@ -158,7 +158,7 @@
 
 //living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"
-#define ui_living_health "EAST-1:28,CENTER:15"
+#define ui_living_health "Right-3:28,South+2:-18"
 
 //borgs
 #define ui_borg_health "EAST-1:28,CENTER-1:15"		//borgs have the health display where humans have the pressure damage indicator.

code/_onclick/hud/hud.dm

@@ -71,6 +71,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/newbie_hud_button
 	var/atom/movable/screen/chardir_hud_button
 	var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle
+	var/atom/movable/screen/who
 	var/atom/movable/screen/flirt_hud_button
 	var/atom/movable/screen/merp_button
 	var/atom/movable/screen/erp_button
@@ -148,6 +149,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	chardir_hud_button = null
 	pvp_focus_toggle = null
 	flirt_hud_button = null
+	who = null
 	merp_button = null
 	erp_button = null
 	vore_button = null

code/_onclick/hud/human.dm

@@ -91,12 +91,12 @@
 	var/atom/movable/screen/using
 	var/atom/movable/screen/inventory/inv_box
 
-	using = new/atom/movable/screen/language_menu
-	using.icon = ui_style
-	if(!widescreenlayout) // CIT CHANGE
-		using.screen_loc = ui_boxlang // CIT CHANGE
-	using.hud = src
-	static_inventory += using
+	// using = new/atom/movable/screen/language_menu
+	// using.icon = ui_style
+	// if(!widescreenlayout) // CIT CHANGE
+	// 	using.screen_loc = ui_boxlang // CIT CHANGE
+	// using.hud = src
+	// static_inventory += using
 
 	using = new /atom/movable/screen/area_creator
 	using.icon = ui_style
@@ -402,6 +402,10 @@
 	// pvp_focus_toggle.hud = src
 	// infodisplay += pvp_focus_toggle
 
+	who = new /atom/movable/screen/who()
+	who.hud = src
+	infodisplay += who
+
 	flirt_hud_button = new /atom/movable/screen/flirt_hud_button()
 	flirt_hud_button.hud = src
 	infodisplay += flirt_hud_button

code/_onclick/hud/screen_objects.dm

@@ -605,8 +605,6 @@
 	name = "health"
 	icon_state = "health0"
 	screen_loc = ui_health
-	mouse_opacity = 0
-	alpha = 0
 	var/base_state = "%100"
 	var/flicker_state = "%100"
 	var/blink_state = "%100"
@@ -670,6 +668,7 @@
 			if(90 to INFINITY)
 				smiley_base          = "^_^"
 				smiley_flicker       = "^_^"
+				smiley_flicker       = "^_^"
 				smiley_blink         = "^_^"
 				smiley_blink_flicker = "^_^"
 				font_color_base = "#5334ff"

code/_onclick/hud/screen_objects/character_actions.dm

@@ -123,6 +123,15 @@
 	if(usr.client)
 		usr.client.show_character_directory()
 
+/atom/movable/screen/who
+	name = "Who"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "who" // milhouse who
+	screen_loc = "WEST+8:-16, SOUTH+1:-13"
+
+/atom/movable/screen/who/Click(location,control,params)
+	SSwho.Who(usr.client)
+
 /atom/movable/screen/flirt_hud_button
 	name = "Flirt with people!"
 	icon = 'icons/mob/screen_gen.dmi'

code/datums/elements/flavor_text.dm

@@ -87,6 +87,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 		examine_list += span_notice("[msg]")
 	else
 		examine_list += "<span class='notice'>[copytext_char(msg, 1, 197)]... <a href='?src=[REF(src)];show_flavor=[REF(target)]'>More...</span></a>"
+	examine_list += "\n"
 
 /datum/element/flavor_text/Topic(href, href_list)
 	. = ..()

code/modules/mob/living/living.dm

@@ -397,6 +397,14 @@
 				var/mob/living/carbon/C = L
 				if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
 					C.grippedby(src)
+
+			if(has_tail())
+				if(L.has_tail())
+					to_chat(src, span_green("You entwine your tail with [L]'s!"))
+					to_chat(L, span_green("[src] entwines [src.p_their()] tail with around yours!"))
+				else
+					to_chat(src, span_green("You entwine your tail around [L]!"))
+					to_chat(L, span_green("[src] entwines [src.p_their()] tail around you!"))
 
 			update_pull_movespeed()
 

code/modules/mob/living/living_defense.dm

@@ -232,11 +232,6 @@
 
 	if(!user.pulling || user.pulling != src)
 		user.start_pulling(src, supress_message = supress_message)
-		if(user.has_tail() && src.has_tail())
-			user.visible_message(
-				span_green("[user] entwines [user.p_their()] tail with around [src]'s!"),
-				span_green("[user] entwines [user.p_their()] tail with around you!"),
-			)
 		return
 
 	if(!(status_flags & CANPUSH) || HAS_TRAIT(src, TRAIT_PUSHIMMUNE))

modular_sand/code/datums/interactions/_interaction.dm

@@ -573,7 +573,7 @@
 		var/word = ""
 		if(LAZYLEN(wordlist))
 			word = trim(pick(wordlist))
-		if(prob(1))
+		if(prob(0.1))
 			word = "bazinga" // required for linting
 		message = splicetext(message, charpos, charpos2 + 1, word)
 	// LAZYSET(formatted_cache, cachekey, message) // for sanic speed

tgui/packages/tgui/interfaces/MobInteraction.js

@@ -324,7 +324,7 @@ const Lust = (props, context) => {
   const TheirMaxLust = data.TheirMaxLust || 100;
   const ItsJustMe = data.ItsJustMe || false;
   const MTTC = data.MTTC; // Mean Time To Cum
-  const CanCum = data.CanCum || false;
+  const CanCum = true; // data.CanCum || false;
   const MyName = data.MyName || "You";
   const TheirName = data.TheirName || "Them";
 
@@ -334,7 +334,7 @@ const Lust = (props, context) => {
   const LustFGColor = "pink";
 
   const CumButtonText = "!! C U M !!";
-  const AutocumText = CanCum ? "Autocum: ON" : "Autocum: OFF";
+  const AutocumText = data.CanCum ? "Autocum: ON" : "Autocum: OFF";
   // let AutocumArray = [];
   // /// run through the bitfields in AutocumFlags and assemble the appropriate text
   // if(AutocumFlags) {
@@ -364,7 +364,7 @@ const Lust = (props, context) => {
   //   AutocumText += "you feel like it!";
   // }
 
-  const AutocumColor = CanCum ? "green" : "default";
+  const AutocumColor = "green"; // CanCum ? "green" : "default";
 
   const CelWidth = ItsJustMe ? "100%" : "50%";