diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 774af878b33..5653c29f1b4 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -2,6 +2,7 @@
name = "item"
icon = 'icons/obj/items.dmi'
var/item_state = null
+ var/inhand_type = "items"
var/hitsound = null
var/throwhitsound = null
var/w_class = 3.0
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 4fe90a2133e..b31b1ea09c7 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -180,7 +180,7 @@ RCD
if(!D.sub_door)
door_check = 0
break
-
+
if(door_check)
user << "Building Airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 600e20cfc62..aff93a5b31e 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -57,10 +57,10 @@
/obj/item/clothing/suit/poncho,
/obj/item/clothing/suit/poncho/green,
/obj/item/clothing/suit/poncho/red)
-
+
gift_type_list += typesof(/obj/item/clothing/head/collectable) - /obj/item/clothing/head/collectable
gift_type_list += typesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/ammo) + /obj/item/toy) //All toys, except for abstract types and syndicate cards.
-
+
var/gift_type = pick(gift_type_list)
if(!ispath(gift_type,/obj/item)) return
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index 533ac210102..eb9db2b9870 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -1,14 +1,12 @@
/proc/getbrokeninhands()
- var/icon/IL = new('icons/mob/items_lefthand.dmi')
- var/list/Lstates = IL.IconStates()
- var/icon/IR = new('icons/mob/items_righthand.dmi')
- var/list/Rstates = IR.IconStates()
-
-
var/text
for(var/A in typesof(/obj/item))
var/obj/item/O = new A( locate(1,1,1) )
if(!O) continue
+ var/icon/IL = new(file("icons/mob/inhands/[O.inhand_type]_lefthand.dmi"))
+ var/list/Lstates = IL.IconStates()
+ var/icon/IR = new(file("icons/mob/inhands/[O.inhand_type]_righthand.dmi"))
+ var/list/Rstates = IR.IconStates()
var/icon/J = new(O.icon)
var/list/istates = J.IconStates()
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index acdb6e25ebe..713f37141ff 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -74,11 +74,12 @@
/mob/living/carbon/alien/humanoid/update_inv_r_hand(update_icons = 1)
if(r_hand)
+ var/t_type = r_hand.inhand_type
var/t_state = r_hand.item_state
if(!t_state)
t_state = r_hand.icon_state
r_hand.screen_loc = ui_rhand
- overlays_standing[X_R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_R_HAND_LAYER] = image("icon" = file("icons/mob/inhands/[t_type]_righthand.dmi"), "icon_state" = t_state)
else
overlays_standing[X_R_HAND_LAYER] = null
if(update_icons)
@@ -86,11 +87,12 @@
/mob/living/carbon/alien/humanoid/update_inv_l_hand(update_icons = 1)
if(l_hand)
+ var/t_type = l_hand.inhand_type
var/t_state = l_hand.item_state
if(!t_state)
t_state = l_hand.icon_state
l_hand.screen_loc = ui_lhand
- overlays_standing[X_L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_L_HAND_LAYER] = image("icon" = file("icons/mob/inhands/[t_type]_lefthand.dmi"), "icon_state" = t_state)
else
overlays_standing[X_L_HAND_LAYER] = null
if(update_icons)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 5b96c53722c..410fb5f99fa 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -536,10 +536,11 @@ Please contact me on #coderbus IRC. ~Carnie x
if(client)
client.screen += r_hand
+ var/t_type = r_hand.inhand_type
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
- overlays_standing[R_HAND_LAYER] = image("icon"='icons/mob/items_righthand.dmi', "icon_state"="[t_state]", "layer"=-R_HAND_LAYER)
+ overlays_standing[R_HAND_LAYER] = image("icon"=file("icons/mob/inhands/[t_type]_righthand.dmi"), "icon_state"="[t_state]", "layer"=-R_HAND_LAYER)
apply_overlay(R_HAND_LAYER)
@@ -555,10 +556,11 @@ Please contact me on #coderbus IRC. ~Carnie x
if(client)
client.screen += l_hand
+ var/t_type = l_hand.inhand_type
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
- overlays_standing[L_HAND_LAYER] = image("icon"='icons/mob/items_lefthand.dmi', "icon_state"="[t_state]", "layer"=-L_HAND_LAYER)
+ overlays_standing[L_HAND_LAYER] = image("icon"=file("icons/mob/inhands/[t_type]_lefthand.dmi"), "icon_state"="[t_state]", "layer"=-L_HAND_LAYER)
apply_overlay(L_HAND_LAYER)
diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm
index a5c5010d810..03520ebfa49 100644
--- a/code/modules/mob/living/carbon/monkey/update_icons.dm
+++ b/code/modules/mob/living/carbon/monkey/update_icons.dm
@@ -58,10 +58,11 @@
r_hand.screen_loc = ui_rhand
if(client && hud_used)
client.screen += r_hand
+ var/t_type = r_hand.inhand_type
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
overlays -= overlays_standing[M_R_HAND_LAYER]
- overlays_standing[M_R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state, "layer" = -M_R_HAND_LAYER)
+ overlays_standing[M_R_HAND_LAYER] = image("icon" = file("icons/mob/inhands/[t_type]_righthand.dmi"), "icon_state" = t_state, "layer" = -M_R_HAND_LAYER)
overlays += overlays_standing[M_R_HAND_LAYER]
else
overlays -= overlays_standing[M_R_HAND_LAYER]
@@ -77,10 +78,11 @@
l_hand.screen_loc = ui_lhand
if(client && hud_used)
client.screen += l_hand
+ var/t_type = l_hand.inhand_type
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
overlays -= overlays_standing[M_L_HAND_LAYER]
- overlays_standing[M_L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state, "layer" = -M_L_HAND_LAYER)
+ overlays_standing[M_L_HAND_LAYER] = image("icon" = file("icons/mob/inhands/[t_type]_lefthand.dmi"), "icon_state" = t_state, "layer" = -M_L_HAND_LAYER)
overlays += overlays_standing[M_L_HAND_LAYER]
else
overlays -= overlays_standing[M_L_HAND_LAYER]
diff --git a/code/modules/mob/living/simple_animal/friendly/drone.dm b/code/modules/mob/living/simple_animal/friendly/drone.dm
index 48912230a76..c0e65360f6f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone.dm
@@ -418,11 +418,12 @@
remove_overlay(HANDS_LAYER)
var/list/hands_overlays = list()
if(r_hand)
+ var/r_type = r_hand.inhand_type
var/r_state = r_hand.item_state
if(!r_state)
r_state = r_hand.icon_state
- hands_overlays += image("icon"='icons/mob/items_righthand.dmi', "icon_state"="[r_state]", "layer"=-HANDS_LAYER)
+ hands_overlays += image("icon"=file("icons/mob/inhands/[r_type]_righthand.dmi"), "icon_state"="[r_state]", "layer"=-HANDS_LAYER)
if(client && hud_used)
r_hand.layer = 20
@@ -430,11 +431,12 @@
client.screen |= r_hand
if(l_hand)
+ var/l_type = l_hand.inhand_type
var/l_state = l_hand.item_state
if(!l_state)
l_state = l_hand.icon_state
- hands_overlays += image("icon"='icons/mob/items_lefthand.dmi', "icon_state"="[l_state]", "layer"=-HANDS_LAYER)
+ hands_overlays += image("icon"=file("icons/mob/inhands/[l_type]_lefthand.dmi"), "icon_state"="[l_state]", "layer"=-HANDS_LAYER)
if(client && hud_used)
l_hand.layer = 20
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 7d26a965f30..ae596c35528 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -128,7 +128,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sun"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "clipboard"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "clipboard"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -151,7 +151,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "bluesuit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "briefcase"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "briefcase"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -159,7 +159,7 @@
if(CHAPLAIN)
clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "bible"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "bible"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -187,7 +187,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "clipboard"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "clipboard"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -212,7 +212,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "firstaid"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -221,7 +221,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "firstaid"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "firstaid"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
if(backbag == 3)
@@ -247,7 +247,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_lefthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_lefthand.dmi', "toolbox_blue"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(backbag == 3)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 16ac5796a48..a72317ca466 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -234,4 +234,4 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
burst_size = 4
- fire_delay = 1
+ fire_delay = 1
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 98c42e57f46..942533fc993 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -154,4 +154,4 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
- user << " You emag the RCS. Click on it to toggle between modes."
+ user << " You emag the RCS. Click on it to toggle between modes."
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
similarity index 100%
rename from icons/mob/items_lefthand.dmi
rename to icons/mob/inhands/items_lefthand.dmi
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
similarity index 100%
rename from icons/mob/items_righthand.dmi
rename to icons/mob/inhands/items_righthand.dmi