cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Seperated ID and PDA slots

Browse Source
This commit is contained in:
ZomgPonies
2013-11-01 13:28:58 -04:00
parent 4630518535
commit 00b101d7f2
29 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/honksquad.dm
+1 -1
View File
@@ -111,7 +111,7 @@ var/global/sent_honksquad = 0
equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
equip_to_slot_or_del(new /obj/item/device/pda/clown(src), slot_belt)
equip_to_slot_or_del(new /obj/item/device/pda/clown(src), slot_wear_pda)
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
code/modules/mob/inventory.dm
+4
View File
@@ -257,6 +257,10 @@
if(!src.wear_id && src.w_uniform)
src.wear_id = W
equipped = 1
if(slot_wear_pda)
if(!src.wear_pda && src.w_uniform)
src.wear_pda = W
equipped = 1
if(slot_l_ear)
if(!src.l_ear)
src.l_ear = W
code/modules/mob/living/carbon/human/human_defines.dm
+1
View File
@@ -37,6 +37,7 @@
var/obj/item/l_ear = null
var/obj/item/r_ear = null
var/obj/item/wear_id = null
var/obj/item/wear_pda = null
var/obj/item/r_store = null
var/obj/item/l_store = null
var/obj/item/s_store = null
code/modules/mob/living/carbon/human/inventory.dm
+14
View File
@@ -49,6 +49,8 @@
if(slot_wear_id)
// the only relevant check for this is the uniform check
return 1
if(slot_wear_pda)
return 1
if(slot_l_ear)
return has_organ("head")
if(slot_r_ear)
@@ -142,6 +144,10 @@
wear_id = null
success = 1
update_inv_wear_id()
else if (W == wear_pda)
wear_pda = null
success = 1
update_inv_wear_pda()
else if (W == r_store)
r_store = null
success = 1
@@ -239,6 +245,10 @@
src.wear_id = W
W.equipped(src, slot)
update_inv_wear_id(redraw_mob)
if(slot_wear_pda)
src.wear_pda = W
W.equipped(src, slot)
update_inv_wear_pda(redraw_mob)
if(slot_l_ear)
src.l_ear = W
if(l_ear.slot_flags & SLOT_TWOEARS)
@@ -635,6 +645,10 @@ It can still be worn/put on as normal.
slot_to_process = slot_wear_id
if (target.wear_id)
strip_item = target.wear_id
if("pda")
slot_to_process = slot_wear_pda
if (target.wear_pda)
strip_item = target.wear_pda
if("back")
slot_to_process = slot_back
if (target.back)
code/modules/mob/living/carbon/human/update_icons.dm
+21 -3
View File
@@ -506,6 +506,7 @@ proc/get_damage_icon_part(damage_state, body_part)
update_inv_handcuffed(0)
update_inv_legcuffed(0)
update_inv_pockets(0)
update_inv_wear_pda(0)
UpdateDamageIcon()
update_icons()
//Hud Stuff
@@ -558,7 +559,7 @@ proc/get_damage_icon_part(damage_state, body_part)
overlays_lying[UNIFORM_LAYER] = null
overlays_standing[UNIFORM_LAYER] = null
// Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY
for( var/obj/item/thing in list(r_store, l_store, wear_id, belt) ) //
for( var/obj/item/thing in list(r_store, l_store, wear_id, wear_pda, belt) ) //
if(thing) //
u_equip(thing) //
if (client) //
@@ -772,6 +773,9 @@ proc/get_damage_icon_part(damage_state, body_part)
if(r_store) r_store.screen_loc = ui_storage2 //TODO
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_wear_pda(var/update_icons=1)
if(wear_pda) wear_pda.screen_loc = ui_pda
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
if( wear_mask && ( istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/tie) ) )
@@ -818,11 +822,25 @@ proc/get_damage_icon_part(damage_state, body_part)
drop_r_hand()
drop_l_hand()
stop_pulling() //TODO: should be handled elsewhere
overlays_lying[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff2")
overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff1")
if(hud_used) //hud handcuff icons
var/obj/screen/inventory/R = hud_used.adding[3]
var/obj/screen/inventory/L = hud_used.adding[4]
R.overlays += image("icon"='icons/mob/screen_gen.dmi', "icon_state"="markus")
L.overlays += image("icon"='icons/mob/screen_gen.dmi', "icon_state"="gabrielle")
if(istype(handcuffed, /obj/item/weapon/handcuffs/pinkcuffs))
overlays_lying[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "pinkcuff2")
overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "pinkcuff1")
else
overlays_lying[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff2")
overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff1")
else
overlays_lying[HANDCUFF_LAYER] = null
overlays_standing[HANDCUFF_LAYER] = null
if(hud_used)
var/obj/screen/inventory/R = hud_used.adding[3]
var/obj/screen/inventory/L = hud_used.adding[4]
R.overlays = null
L.overlays = null
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_legcuffed(var/update_icons=1)
code/modules/mob/mob.dm
+1
View File
@@ -142,6 +142,7 @@
var/list/slot_equipment_priority = list( \
slot_back,\
slot_wear_id,\
slot_wear_pda,\
slot_w_uniform,\
slot_wear_suit,\
slot_wear_mask,\
code/modules/mob/update_icons.dm
+3
View File
@@ -61,6 +61,9 @@
/mob/proc/update_inv_pockets()
return
mob/proc/update_inv_wear_pda()
return
/mob/proc/update_inv_ears()
return