Merge pull request #39 from ARF-SS13/fenwork

Fenwork

_maps/map_files/coyote_bayou/foxybar.dmm

@@ -2929,7 +2929,6 @@
 	dir = 4;
 	color = "#3B2B1A"
 	},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175

code/_onclick/hud/_defines.dm

@@ -145,6 +145,7 @@
 #define ui_character_actions	"EAST-1:28, SOUTH+1:2"
 #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
 
 //living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"

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/flirt_hud_button
 
 	// subtypes can override this to force a specific UI style
 	var/ui_style

code/_onclick/hud/human.dm

@@ -394,9 +394,13 @@
 	chardir_hud_button.hud = src
 	infodisplay += chardir_hud_button
 
-	pvp_focus_toggle = new /atom/movable/screen/pvp_focus_toggle()
-	pvp_focus_toggle.hud = src
-	infodisplay += pvp_focus_toggle
+	// pvp_focus_toggle = new /atom/movable/screen/pvp_focus_toggle()
+	// pvp_focus_toggle.hud = src
+	// infodisplay += pvp_focus_toggle
+
+	flirt_hud_button = new /atom/movable/screen/flirt_hud_button()
+	flirt_hud_button.hud = src
+	infodisplay += flirt_hud_button
 
 	pull_icon = new /atom/movable/screen/pull()
 	pull_icon.icon = ui_style

code/_onclick/hud/screen_objects/character_actions.dm

@@ -123,6 +123,19 @@
 	if(usr.client)
 		usr.client.show_character_directory()
 
+/atom/movable/screen/flirt_hud_button
+	name = "Flirt with people!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "flirt"
+	screen_loc = ui_flirt
+
+/atom/movable/screen/flirt_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("flirt")
+
 /atom/movable/screen/pvp_focus_toggle
 	name = "PVP focus On/Off"
 	icon = 'icons/mob/screen_gen.dmi'

code/game/objects/structures/tables_racks.dm

@@ -147,7 +147,7 @@
 	pushed_mob.Knockdown(30)
 	var/obj/item/bodypart/banged_limb = pushed_mob.get_bodypart(user.zone_selected) || pushed_mob.get_bodypart(BODY_ZONE_HEAD)
 	if(HAS_TRAIT(user, TRAIT_HULK))
-	pushed_mob.apply_damage(60, STAMINA)
+		pushed_mob.apply_damage(60, STAMINA)
 
 	playsound(pushed_mob, 'sound/effects/bang.ogg', 40, TRUE)
 	pushed_mob.visible_message(span_danger("[user] smashes [pushed_mob]'s [banged_limb.name] against \the [src]!"),

modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm

@@ -1,53 +1,53 @@
 /datum/sprite_accessory/tails/mam_tails/demon_spade
 	name = "Demon Spade"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	icon_state = "demonspade"
 	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/demon_spade
 	name = "Demon Spade"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	icon_state = "demonspade"
 	matrixed_sections = MATRIX_RED
 
 /datum/sprite_accessory/tails/mam_tails/zorgoia //Ported from ARFS-Coyote
 	name = "Zorgoia"
 	icon_state = "zorgoia"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/zorgoia //Ported from ARFS-Coyote
 	name = "Zorgoia"
 	icon_state = "zorgoia"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_ALL
 
 /datum/sprite_accessory/tails/mam_tails/fennecdown //Ported from ARFS-Coyote
 	name = "Downward Fennec Tail"
 	icon_state = "downwardfennec"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/mam_tails_animated/fennecdown //Ported from ARFS-Coyote
 	name = "Downward Fennec Tail"
 	icon_state = "downwardfennec"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails/human/fennecdown //Ported from ARFS-Coyote
 	name = "Downward Fennec Tail"
 	icon_state = "downwardfennec"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN
 
 /datum/sprite_accessory/tails_animated/human/fennecdown //Ported from ARFS-Coyote
 	name = "Downward Fennec Tail"
 	icon_state = "downwardfennec"
-	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	icon = 'icons/mob/mam/citadel/mam_tails.dmi'
 	color_src = MATRIXED
 	matrixed_sections = MATRIX_RED_GREEN