Merge pull request #191 from ARF-SS13/123124a

Private Panel button and bean/cuphand shift

code/_onclick/hud/hud.dm

@@ -85,6 +85,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/tail_hud_button
 	var/atom/movable/screen/cuphand_hud_button
 	var/atom/movable/screen/beans_hud_button
+	var/atom/movable/screen/private_panel_button
+	var/atom/movable/screen/give_button
+	var/atom/movable/screen/reload_button
 	var/atom/movable/screen/tend_hud_button
 	var/atom/movable/screen/butt_hud_button
 

code/_onclick/hud/human.dm

@@ -450,6 +450,18 @@
 	cuphand_hud_button.hud = src
 	infodisplay += cuphand_hud_button
 
+	private_panel_button = new /atom/movable/screen/private_panel_button()
+	private_panel_button.hud = src
+	infodisplay += private_panel_button
+
+	give_button = new /atom/movable/screen/give_button()
+	give_button.hud = src
+	infodisplay += give_button	
+
+	reload_button = new /atom/movable/screen/reload_button()
+	reload_button.hud = src
+	infodisplay += reload_button
+
 	beans_hud_button = new /atom/movable/screen/beans_hud_button()
 	beans_hud_button.hud = src
 	infodisplay += beans_hud_button

code/_onclick/hud/screen_objects/character_actions.dm

@@ -442,6 +442,51 @@
 		return
 	H.emote("kiss")
 
+////////////////////////////////////////////////////////////
+/// Private panel button
+/atom/movable/screen/private_panel_button
+	name = "fool with your privates!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "privatepanel"
+	screen_loc = "EAST-0:-4, SOUTH+3:-3"
+
+/atom/movable/screen/private_panel_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.toggle_genitals()
+
+////////////////////////////////////////////////////////////
+/// give button
+/atom/movable/screen/give_button
+	name = "give somebody something!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "give"
+	screen_loc = "CENTER+1:15,SOUTH+1:3"
+
+/atom/movable/screen/give_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.give()
+
+////////////////////////////////////////////////////////////
+/// reload button
+/atom/movable/screen/reload_button
+	name = "reload a firearm!"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "reload"
+	screen_loc = "CENTER+2:11,SOUTH+1:3"
+
+/atom/movable/screen/reload_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.ReloadGun()
+
 ////////////////////////////////////////////////////////////
 /// Bite button
 /atom/movable/screen/bite_hud_button
@@ -493,7 +538,7 @@
 	name = "cuphand on people!"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "cuphand"
-	screen_loc = "EAST-1:4, SOUTH+4: 8"
+	screen_loc = "EAST-1:4, SOUTH+4: 12"
 
 /atom/movable/screen/cuphand_hud_button/Click(location,control,params)
 	var/mob/living/carbon/human/H = usr
@@ -508,7 +553,7 @@
 	name = "bean on people!"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "beans"
-	screen_loc = "EAST-2:4, SOUTH+4:12"
+	screen_loc = "EAST-1:4, SOUTH+4:8"
 
 /atom/movable/screen/beans_hud_button/Click(location,control,params)
 	var/mob/living/carbon/human/H = usr
@@ -523,7 +568,7 @@
 	name = "tend on people!"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "tend"
-	screen_loc = "EAST-1:4, SOUTH+4:1"
+	screen_loc = "EAST-1:4, SOUTH+5:1"
 
 /atom/movable/screen/tend_hud_button/Click(location,control,params)
 	var/mob/living/carbon/human/H = usr

code/controllers/subsystem/statpanel.dm

@@ -23,15 +23,15 @@ SUBSYSTEM_DEF(statpanels)
 
 /datum/controller/subsystem/statpanels/fire(resumed = FALSE)
 	if (!resumed)
-		var/datum/map_config/cached = SSmapping.next_map_config
+		//var/datum/map_config/cached = SSmapping.next_map_config
 		var/list/global_data = list(
-			"Map: [SSmapping.config?.map_name || "Loading..."]",
-			cached ? "Next Map: [cached.map_name]" : null,
-			"Round Number: [GLOB.round_id ? GLOB.round_id : "NULL"]",
-			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
-			"Round Time: [ROUND_TIME]",
-			"Station Time: [STATION_TIME_TIMESTAMP(FALSE, world.time)]",
-			"Server Anger Level: [SStime_track.get_anger()]",
+			// "Map: [SSmapping.config?.map_name || "Loading..."]",
+			// cached ? "Next Map: [cached.map_name]" : null,
+			// "Round Number: [GLOB.round_id ? GLOB.round_id : "NULL"]",
+			// "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
+			// "Round Time: [ROUND_TIME]",
+			// "Station Time: [STATION_TIME_TIMESTAMP(FALSE, world.time)]",
+			// "Server Anger Level: [SStime_track.get_anger()]",
 			"----------------------------",
 			"[the_majority]",
 			"[nashs_most_wanted]",

code/game/objects/objs_set_vars_verbs.dm

@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(obj_vars_allowed_to_modify, list(
 
 
 /mob/living/verb/objs_edit_vars(atom/A as obj in view(1))
-	set name = "Edit Vars (Shift, Rotate, Layer)."
+	set name = "Adjust Object (Shift, Rotate, Layer)."
 	set category = "Object"
 
 	//Blacklist of stuff that isn't allowed to be modified, such as trees