Merge pull request tgstation#25818 from AnturK/monkey_slots

Monkey fixes
Chronitonity · Apr 4, 2017 · 525325b · 525325b
2 parents 22bd4c4 + 20b4d64
commit 525325b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -64,10 +64,10 @@
 #define ui_borg_album "CENTER+4:21,SOUTH:5"			//borgs
 #define ui_borg_language_menu "CENTER+4:21,SOUTH+1:5"	//borgs
 
-#define ui_monkey_head "CENTER-4:13,SOUTH:5"	//monkey
-#define ui_monkey_mask "CENTER-3:14,SOUTH:5"	//monkey
-#define ui_monkey_neck "CENTER-2:15,SOUTH:5"	//monkey
-#define ui_monkey_back "CENTER-1:16,SOUTH:5"	//monkey
+#define ui_monkey_head "CENTER-5:13,SOUTH:5"	//monkey
+#define ui_monkey_mask "CENTER-4:14,SOUTH:5"	//monkey
+#define ui_monkey_neck "CENTER-3:15,SOUTH:5"	//monkey
+#define ui_monkey_back "CENTER-2:16,SOUTH:5"	//monkey
 
 #define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
 #define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien

diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
@@ -69,8 +69,7 @@
 	inv_box.name = "back"
 	inv_box.icon = ui_style
 	inv_box.icon_state = "back"
-	inv_box.icon_full = "template_small"
-	inv_box.screen_loc = ui_back
+	inv_box.screen_loc = ui_monkey_back
 	inv_box.slot_id = slot_back
 	static_inventory += inv_box
 
@@ -123,7 +122,7 @@
 
 	if(hud_shown)
 		if(M.back)
-			M.back.screen_loc = ui_back
+			M.back.screen_loc = ui_monkey_back
 			M.client.screen += M.back
 		if(M.wear_mask)
 			M.wear_mask.screen_loc = ui_monkey_mask

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
@@ -315,6 +315,9 @@
 		togglelock(user)
 		return
 
+/obj/structure/closet/attack_paw(mob/user)
+	return attack_hand(user)
+
 /obj/structure/closet/attack_robot(mob/user)
 	if(user.Adjacent(src))
 		return attack_hand(user)

diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm
@@ -68,7 +68,7 @@
 //update whether our neck item appears on our hud.
 /mob/living/carbon/monkey/update_hud_neck(obj/item/I)
 	if(client && hud_used && hud_used.hud_shown)
-		I.screen_loc = ui_monkey_mask
+		I.screen_loc = ui_monkey_neck
 		client.screen += I
 
 //update whether our back item appears on our hud.

diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
@@ -41,8 +41,8 @@
 	..()
 	update_icon()
 
-/obj/item/weapon/reagent_containers/syringe/attack_paw()
-	return attack_hand()
+/obj/item/weapon/reagent_containers/syringe/attack_paw(mob/user)
+	return attack_hand(user)
 
 /obj/item/weapon/reagent_containers/syringe/attackby(obj/item/I, mob/user, params)
 	return