- Changed the drop, throw, pull icons to be 32x16 icons (Sprites by Cheri)

- Pull is no longer a persistent button but only appears when you start pulling something - Resist added as a 32x16 persistent button - Toggle hotkey buttons now also shows/hides the resist button - Some unneeded text() -s removed from storage and secstorage code. Screenshots for the midnight tileset: http://www.kamletos.si/hud%20tweak%204.PNG http://www.kamletos.si/hud%20tweak%204b.PNG git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3735 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-25 09:31:30 +00:00 · 2012-06-03 18:45:03 +00:00
parent 2ce2243223
commit 4633f6a44c
13 changed files with 69 additions and 33 deletions
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -35,13 +35,15 @@
 #define ui_monkey_back "6:14,1:5"	//monkey

 //Lower right, persistant menu
-#define ui_dropbutton "12:24,2:7"
-#define ui_throw "13:26,2:7"
-#define ui_pull "14:28,2:7"
+#define ui_drop_throw "14:28,2:7"
+#define ui_pull_resist "13:26,2:7"
 #define ui_acti "12:24,1:5"
 #define ui_movi "13:26,1:5"
 #define ui_zonesel "14:28,1:5"

+#define ui_borg_pull "12:24,2:7"
+#define ui_borg_module "13:26,2:7"
+#define ui_borg_panel "14:28,2:7"

 //Upper-middle right (damage indicators)
 #define ui_toxin "14:28,13:27"
@@ -90,7 +92,7 @@
 //#define ui_headset "SOUTH,8"
 #define ui_hand "6:14,1:5"
 #define ui_hstore1 "5,5"
-#define ui_resist "EAST+1,SOUTH-1"
+//#define ui_resist "EAST+1,SOUTH-1"
 #define ui_sleep "EAST+1, NORTH-13"
 #define ui_rest "EAST+1, NORTH-14"

--- a/code/game/objects/secstorage/secstorage.dm
+++ b/code/game/objects/secstorage/secstorage.dm
@@ -67,16 +67,16 @@

 	var/cx = tx
 	var/cy = ty
-	src.boxes.screen_loc = text("[],[] to [],[]", tx, ty, mx, my)
+	src.boxes.screen_loc = "[tx],[ty] to [mx],[my]"
 	for(var/obj/O in src.contents)
-		O.screen_loc = text("[],[]", cx, cy)
+		O.screen_loc = "[cx],[cy]"
 		O.layer = 20
 		cx++
 		if (cx > mx)
 			cx = tx
 			cy--
 		//Foreach goto(56)
-	src.closer.screen_loc = text("[],[]", mx, my)
+	src.closer.screen_loc = "[mx],[my]"
 	return

 //This proc draws out the inventory and places the items on it. It uses the standard position.
@@ -85,15 +85,15 @@
 	var/cols = 6
 	var/cx = 4
 	var/cy = 2+rows
-	src.boxes.screen_loc = text("4:16,2:16 to [4+cols]:16,[2+rows]:16")
+	src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16"
 	for(var/obj/O in src.contents)
-		O.screen_loc = text("[cx]:16,[cy]:16")
+		O.screen_loc = "[cx]:16,[cy]:16"
 		O.layer = 20
 		cx++
 		if (cx > (4+cols))
 			cx = 4
 			cy--
-	src.closer.screen_loc = text("11:16,2:16")
+	src.closer.screen_loc = "11:16,2:16"
 	return

 /obj/item/weapon/secstorage/proc/orient2hud(mob/user as mob)
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -66,30 +66,30 @@
 /obj/item/weapon/storage/proc/orient_objs(tx, ty, mx, my)
 	var/cx = tx
 	var/cy = ty
-	src.boxes.screen_loc = text("[tx]:,[ty] to [mx],[my]")
+	src.boxes.screen_loc = "[tx]:,[ty] to [mx],[my]"
 	for(var/obj/O in src.contents)
-		O.screen_loc = text("[cx],[cy]")
+		O.screen_loc = "[cx],[cy]"
 		O.layer = 20
 		cx++
 		if (cx > mx)
 			cx = tx
 			cy--
-	src.closer.screen_loc = text("[mx+1],[my]")
+	src.closer.screen_loc = "[mx+1],[my]"
 	return

 //This proc draws out the inventory and places the items on it. It uses the standard position.
 /obj/item/weapon/storage/proc/standard_orient_objs(var/rows,var/cols)
 	var/cx = 4
 	var/cy = 2+rows
-	src.boxes.screen_loc = text("4:16,2:16 to [4+cols]:16,[2+rows]:16")
+	src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16"
 	for(var/obj/O in src.contents)
-		O.screen_loc = text("[cx]:16,[cy]:16")
+		O.screen_loc = "[cx]:16,[cy]:16"
 		O.layer = 20
 		cx++
 		if (cx > (4+cols))
 			cx = 4
 			cy--
-	src.closer.screen_loc = text("[4+cols+1]:16,2:16")
+	src.closer.screen_loc = "[4+cols+1]:16,2:16"
 	return

 //This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing.
--- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
@@ -142,7 +142,7 @@
 	using.name = "drop"
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_dropbutton
+	using.screen_loc = ui_drop_throw
 	using.layer = 19
 	src.adding += using

@@ -257,7 +257,7 @@
 	mymob.throw_icon.icon = 'screen1_alien.dmi'
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
-	mymob.throw_icon.screen_loc = ui_throw
+	mymob.throw_icon.screen_loc = ui_drop_throw

 	mymob.oxygen = new /obj/screen( null )
 	mymob.oxygen.icon = 'screen1_alien.dmi'
@@ -287,7 +287,7 @@
 	mymob.pullin.icon = 'screen1_alien.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_resist

 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_alien.dmi'
--- a/code/modules/mob/living/carbon/alien/larva/hud.dm
+++ b/code/modules/mob/living/carbon/alien/larva/hud.dm
@@ -10,6 +10,7 @@
 	src.mov_int = list(  )
 	src.vimpaired = list(  )
 	src.darkMask = list(  )
+	src.intent_small_hud_objects = list(  )

 	src.g_dither = new src.h_type( src )
 	src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
@@ -51,6 +52,41 @@
 	src.adding += using
 	action_intent = using

+//intent small hud objects
+	using = new src.h_type( src )
+	using.name = "help"
+	using.icon = 'screen1_alien.dmi'
+	using.icon_state = "help_small"
+	using.screen_loc = ui_help_small
+	using.layer = 21
+	src.intent_small_hud_objects += using
+
+	using = new src.h_type( src )
+	using.name = "disarm"
+	using.icon = 'screen1_alien.dmi'
+	using.icon_state = "disarm_small"
+	using.screen_loc = ui_disarm_small
+	using.layer = 21
+	src.intent_small_hud_objects += using
+
+	using = new src.h_type( src )
+	using.name = "grab"
+	using.icon = 'screen1_alien.dmi'
+	using.icon_state = "grab_small"
+	using.screen_loc = ui_grab_small
+	using.layer = 21
+	src.intent_small_hud_objects += using
+
+	using = new src.h_type( src )
+	using.name = "harm"
+	using.icon = 'screen1_alien.dmi'
+	using.icon_state = "harm_small"
+	using.screen_loc = ui_harm_small
+	using.layer = 21
+	src.intent_small_hud_objects += using
+
+//end intent small hud objects
+
 	using = new src.h_type( src )
 	using.name = "mov_intent"
 	using.dir = SOUTHWEST
@@ -179,7 +215,7 @@
 	mymob.pullin.icon = 'screen1_alien.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_resist

 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_alien.dmi'
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -147,7 +147,7 @@
 	using.name = "drop"
 	using.icon = ui_style
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_dropbutton
+	using.screen_loc = ui_drop_throw
 	using.layer = 19
 	src.hotkeybuttons += using

@@ -272,15 +272,13 @@
 	using.layer = 19
 	src.adding += using

-/*
 	using = new src.h_type( src )
 	using.name = "resist"
 	using.icon = ui_style
 	using.icon_state = "act_resist"
-	using.screen_loc = ui_resist
+	using.screen_loc = ui_pull_resist
 	using.layer = 19
-	src.adding += using
-*/
+	src.hotkeybuttons += using

 	using = new src.h_type( src )
 	using.name = "other"
@@ -512,7 +510,7 @@
 	mymob.throw_icon.icon = ui_style
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
-	mymob.throw_icon.screen_loc = ui_throw
+	mymob.throw_icon.screen_loc = ui_drop_throw
 	src.hotkeybuttons += mymob.throw_icon

 	mymob.oxygen = new /obj/screen( null )
@@ -580,7 +578,7 @@
 	mymob.pullin.icon = ui_style
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_resist
 	src.hotkeybuttons += mymob.pullin

 	mymob.blind = new /obj/screen( null )
--- a/code/modules/mob/living/carbon/monkey/hud.dm
+++ b/code/modules/mob/living/carbon/monkey/hud.dm
@@ -147,7 +147,7 @@
 	using.name = "drop"
 	using.icon = ui_style
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_dropbutton
+	using.screen_loc = ui_drop_throw
 	using.layer = 19
 	src.adding += using
 /*
@@ -429,7 +429,7 @@
 	mymob.throw_icon.icon = ui_style
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
-	mymob.throw_icon.screen_loc = ui_throw
+	mymob.throw_icon.screen_loc = ui_drop_throw

 	mymob.oxygen = new /obj/screen( null )
 	mymob.oxygen.icon = ui_style
@@ -489,7 +489,7 @@
 	mymob.pullin.icon = ui_style
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_pull_resist

 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = ui_style
--- a/code/modules/mob/living/silicon/robot/hud.dm
+++ b/code/modules/mob/living/silicon/robot/hud.dm
@@ -159,14 +159,14 @@
 	mymob.hands.icon = 'screen1_robot.dmi'
 	mymob.hands.icon_state = "nomod"
 	mymob.hands.name = "module"
-	mymob.hands.screen_loc = ui_dropbutton
+	mymob.hands.screen_loc = ui_borg_module

 //Module Panel
 	using = new src.h_type( src )
 	using.name = "panel"
 	using.icon = 'screen1_robot.dmi'
 	using.icon_state = "panel"
-	using.screen_loc = ui_throw
+	using.screen_loc = ui_borg_panel
 	using.layer = 19
 	src.adding += using

@@ -202,7 +202,7 @@
 	mymob.pullin.icon = 'screen1_robot.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull
+	mymob.pullin.screen_loc = ui_borg_pull

 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_robot.dmi'