Merge pull request #45 from ARF-SS13/drink-transfer-amount-reflavor-&…

…-pillows

Reflavor drinking amounts, pillows, and maybe add ashtrays.   Oh, and inhand icon state.

code/__DEFINES/traits.dm

@@ -377,6 +377,7 @@
 #define TRAIT_CLAM_TONGUE "clam_tongue"
 #define TRAIT_CLAM_LOVER "clam_lover"
 #define TRAIT_CLAM_FISHER "clam_fisher"
+#define TRAIT_PILLOW_CRIMINAL "pillow_crimes"
 
 #define TRAIT_NO_PVP_EVER "no_pvp_ever"
 

code/__DEFINES/weather.dm

@@ -117,12 +117,12 @@ GLOBAL_LIST_INIT(z2name, list(
 
 /// All weather tags
 #define WEATHER_ALL WEATHER_HEAT,\
-	WEATHER_COLD,\
-	WEATHER_SNOW,\
-	WEATHER_RAIN,\
-	WEATHER_ACID,\
-	WEATHER_SAND,\
-	WEATHER_RADS
+	WEATHER_RAIN
+	// WEATHER_COLD,
+	// WEATHER_SNOW,
+	// WEATHER_ACID,
+	// WEATHER_SAND,
+	// WEATHER_RADS
 
 /// All weather tags,
 #define WEATHER_ALL_MINUS_HEAT WEATHER_COLD,\

code/_globalvars/misc.dm

@@ -30,6 +30,6 @@ GLOBAL_VAR(religion)
 GLOBAL_VAR(deity)
 GLOBAL_VAR(bible_name)
 GLOBAL_VAR(bible_icon_state)
-GLOBAL_VAR(bible_item_state)
+GLOBAL_VAR(bible_inhand_icon_state)
 GLOBAL_VAR(holy_weapon_type)
 GLOBAL_VAR(holy_armor_type)

code/_onclick/hud/_defines.dm

@@ -146,6 +146,9 @@
 #define ui_bayou				"EAST-1:28, SOUTH+0:2" //Character directory
 #define ui_pvpbuttons			"EAST-1:28, SOUTH+1:18" //slut directory
 #define ui_flirt			"EAST-1:28, SOUTH+2:0" //slut directory
+#define ui_touch			"EAST-1:28, SOUTH+2:-4" //slut directory
+#define ui_lick			"EAST-1:28, SOUTH+3:-10" //slut directory
+#define ui_kiss			"EAST-1:28, SOUTH+3:-14" //slut directory
 
 //living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"

code/_onclick/hud/hud.dm

@@ -72,6 +72,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/chardir_hud_button
 	var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle
 	var/atom/movable/screen/flirt_hud_button
+	var/atom/movable/screen/touch_hud_button
+	var/atom/movable/screen/lick_hud_button
+	var/atom/movable/screen/kiss_hud_button
+
 
 	// subtypes can override this to force a specific UI style
 	var/ui_style

code/_onclick/hud/human.dm

@@ -402,6 +402,18 @@
 	flirt_hud_button.hud = src
 	infodisplay += flirt_hud_button
 
+	touch_hud_button = new /atom/movable/screen/touch_hud_button()
+	touch_hud_button.hud = src
+	infodisplay += touch_hud_button
+
+	lick_hud_button = new /atom/movable/screen/lick_hud_button()
+	lick_hud_button.hud = src
+	infodisplay += lick_hud_button
+
+	kiss_hud_button = new /atom/movable/screen/kiss_hud_button()
+	kiss_hud_button.hud = src
+	infodisplay += kiss_hud_button
+
 	pull_icon = new /atom/movable/screen/pull()
 	pull_icon.icon = ui_style
 	pull_icon.hud = src

code/_onclick/hud/screen_objects/character_actions.dm

@@ -30,23 +30,23 @@
 	screen_loc = ui_character_actions
 
 /atom/movable/screen/up/Click(location,control,params)
-	if(isliving(usr))
-		var/mob/living/L = usr
-		to_chat(L, span_danger("Double clicking on the same button will make you travel up, if possible."))
-		L.lookup()
-
-/atom/movable/screen/up/DblClick(location,control,params)
-	var/mob/L = usr
-	L.up()
+	var/mob/living/carbon/human/H = usr
+	if(!ishuman(usr))
+		to_chat(usr, span_alert("Sorry! You've gotta be a fully spawned in character with hopes and dreams to use this!"))
+		return
+	H.layershift_up()
 
 /atom/movable/screen/down
 	name = "down"
 	icon_state = "down"
 	screen_loc = ui_character_actions
 
 /atom/movable/screen/down/Click(location,control,params)
-	var/mob/L = usr
-	L.down()
+	var/mob/living/carbon/human/H = usr
+	if(!ishuman(usr))
+		to_chat(usr, span_alert("Sorry! You've gotta be a fully spawned in character with hopes and dreams to use this!"))
+		return
+	H.layershift_down()
 
 /atom/movable/screen/sleep_hud_button
 	name = "sleep toggle"
@@ -136,6 +136,47 @@
 		return
 	H.emote("flirt")
 
+/atom/movable/screen/touch_hud_button
+	name = "Touch on people!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "touch"
+	screen_loc = ui_touch
+
+/atom/movable/screen/touch_hud_button/Click(location,control,params)
+	var/mob/living/carbon/human/H = usr
+	if(!ishuman(usr))
+		to_chat(usr, span_alert("Sorry! You've gotta be a fully spawned in character with hopes and dreams to use this!"))
+		return
+	H.emote("touch")
+
+/atom/movable/screen/lick_hud_button
+	name = "lick on people!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "lick"
+	screen_loc = ui_lick
+
+/atom/movable/screen/lick_hud_button/Click(location,control,params)
+	var/mob/living/carbon/human/H = usr
+	if(!ishuman(usr))
+		to_chat(usr, span_alert("Sorry! You've gotta be a fully spawned in character with hopes and dreams to use this!"))
+		return
+	H.emote("lick")
+
+/atom/movable/screen/kiss_hud_button
+	name = "kiss on people!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "kiss"
+	screen_loc = ui_kiss
+
+/atom/movable/screen/kiss_hud_button/Click(location,control,params)
+	var/mob/living/carbon/human/H = usr
+	if(!ishuman(usr))
+		to_chat(usr, span_alert("Sorry! You've gotta be a fully spawned in character with hopes and dreams to use this!"))
+		return
+	H.emote("kiss")
+
+
+
 /atom/movable/screen/pvp_focus_toggle
 	name = "PVP focus On/Off"
 	icon = 'icons/mob/screen_gen.dmi'

code/_onclick/telekinesis.dm

@@ -71,7 +71,7 @@
 	icon = 'icons/obj/magic.dmi'//Needs sprites
 	icon_state = "2"
 	item_flags = NOBLUDGEON | ABSTRACT | DROPDEL
-	//item_state = null
+	//inhand_icon_state = null
 	w_class = WEIGHT_CLASS_GIGANTIC
 	layer = ABOVE_HUD_LAYER
 	plane = ABOVE_HUD_PLANE

code/controllers/subsystem/economy.dm

@@ -2265,7 +2265,7 @@ SUBSYSTEM_DEF(economy)
 	desc = "A handy little modified zorcher used by independant Guild contractors to bend the fabric of reality and deliver specific quest related things to parts unknown."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "export_scanner"
-	item_state = "radio"
+	inhand_icon_state = "radio"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	item_flags = PERSONAL_ITEM

code/controllers/subsystem/religion.dm

@@ -6,6 +6,6 @@ SUBSYSTEM_DEF(religion)
 	var/deity
 	var/bible_name
 	var/bible_icon_state
-	var/bible_item_state
+	var/bible_inhand_icon_state
 	var/holy_weapon_type
 	var/holy_armor_type

code/datums/components/embedded.dm

@@ -319,9 +319,9 @@
 			pixelX -= 2
 
 	if(throwingdatum.init_dir in list(NORTH,  WEST, NORTHWEST, SOUTHWEST))
-		overlay = mutable_appearance(icon=weapon.righthand_file,icon_state=weapon.item_state)
+		overlay = mutable_appearance(icon=weapon.righthand_file,icon_state=weapon.inhand_icon_state)
 	else
-		overlay = mutable_appearance(icon=weapon.lefthand_file,icon_state=weapon.item_state)
+		overlay = mutable_appearance(icon=weapon.lefthand_file,icon_state=weapon.inhand_icon_state)
 
 	var/matrix/M = matrix()
 	M.Translate(pixelX, pixelY)

code/datums/components/melee_special.dm

@@ -516,7 +516,7 @@
 	name = "debug melee turf thing"
 	desc = "debug melee turf thing"
 	icon_state = "sord"
-	item_state = "sord"
+	inhand_icon_state = "sord"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	slot_flags = INV_SLOTBIT_BELT