mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 08:34:16 +01:00
- Removed hat storage.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3608 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -243,9 +243,6 @@
|
||||
t1 = s_store.icon_state
|
||||
s_store.screen_loc = ui_sstore1
|
||||
|
||||
if (h_store)
|
||||
h_store.screen_loc = ui_hstore1
|
||||
|
||||
if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
|
||||
//to hide / show them.
|
||||
if (client)
|
||||
|
||||
@@ -206,14 +206,6 @@
|
||||
using.layer = 19
|
||||
src.other += using
|
||||
|
||||
using = new src.h_type( src )
|
||||
using.name = "hat storage"
|
||||
using.icon = ui_style
|
||||
using.icon_state = "hair"
|
||||
using.screen_loc = ui_hstore1
|
||||
using.layer = 19
|
||||
src.other += using
|
||||
|
||||
using = new src.h_type( src )
|
||||
using.name = "resist"
|
||||
using.icon = ui_style
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
var/obj/item/weapon/r_store = null
|
||||
var/obj/item/weapon/l_store = null
|
||||
var/obj/item/weapon/s_store = null
|
||||
var/obj/item/weapon/h_store = null
|
||||
|
||||
var/icon/stand_icon = null
|
||||
var/icon/lying_icon = null
|
||||
@@ -382,15 +381,6 @@
|
||||
glasses = null
|
||||
else if (W == head)
|
||||
var/obj/item/prev_head = W
|
||||
W = h_store
|
||||
if (W)
|
||||
u_equip(W)
|
||||
if (client)
|
||||
client.screen -= W
|
||||
if (W)
|
||||
W.loc = loc
|
||||
W.dropped(src)
|
||||
W.layer = initial(W.layer)
|
||||
head = null
|
||||
if(prev_head && (prev_head.flags & BLOCKHAIR))
|
||||
// rebuild face
|
||||
@@ -423,8 +413,6 @@
|
||||
l_store = null
|
||||
else if (W == s_store)
|
||||
s_store = null
|
||||
else if (W == h_store)
|
||||
h_store = null
|
||||
else if (W == back)
|
||||
back = null
|
||||
else if (W == handcuffed)
|
||||
@@ -629,22 +617,6 @@
|
||||
u_equip(W)
|
||||
s_store = W
|
||||
|
||||
if("hat storage")
|
||||
if (h_store)
|
||||
if (emptyHand)
|
||||
h_store.DblClick()
|
||||
return
|
||||
var/confirm
|
||||
if (head)
|
||||
if (istype(W, /obj/item/weapon/pen))
|
||||
confirm = 1
|
||||
if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
|
||||
confirm = 1
|
||||
if (!confirm) return
|
||||
else
|
||||
u_equip(W)
|
||||
h_store = W
|
||||
|
||||
update_clothing()
|
||||
|
||||
return
|
||||
@@ -918,9 +890,6 @@
|
||||
overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
||||
s_store.screen_loc = ui_sstore1
|
||||
|
||||
if (h_store)
|
||||
h_store.screen_loc = ui_hstore1
|
||||
|
||||
if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
|
||||
//to hide / show them.
|
||||
if (client)
|
||||
@@ -1475,8 +1444,6 @@
|
||||
message = text("\red <B>[] is trying to take off \a [] from []'s body!</B>", source, target.w_uniform, target)
|
||||
if("s_store")
|
||||
message = text("\red <B>[] is trying to take off \a [] from []'s suit!</B>", source, target.s_store, target)
|
||||
if("h_store")
|
||||
message = text("\red <B>[] is trying to empty []'s hat!</B>", source, target)
|
||||
if("pockets")
|
||||
for(var/obj/item/weapon/mousetrap/MT in list(target.l_store, target.r_store))
|
||||
if(MT.armed)
|
||||
@@ -1867,17 +1834,6 @@ It can still be worn/put on as normal.
|
||||
item.layer = 20
|
||||
target.back = item
|
||||
item.loc = target
|
||||
if("h_store")
|
||||
if (target.h_store)
|
||||
var/obj/item/W = target.h_store
|
||||
target.u_equip(W)
|
||||
if (target.client)
|
||||
target.client.screen -= W
|
||||
if (W)
|
||||
W.loc = target.loc
|
||||
W.dropped(target)
|
||||
W.layer = initial(W.layer)
|
||||
W.add_fingerprint(source)
|
||||
if("handcuff")
|
||||
if (target.handcuffed)
|
||||
var/obj/item/W = target.handcuffed
|
||||
@@ -2019,7 +1975,6 @@ It can still be worn/put on as normal.
|
||||
<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
|
||||
<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
|
||||
<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
|
||||
<BR><A href='?src=\ref[src];item=h_store'>Empty Hat</A>
|
||||
<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
|
||||
<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
|
||||
<BR>"}
|
||||
|
||||
Reference in New Issue
Block a user