cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1097 from ariaworld/fix-tailbags

Browse Source 
[REFACTOR] Refactor, clean and optimize tailbag code.
This commit is contained in:
BongaTheProto
2024-03-11 17:09:27 -05:00
committed by GitHub
parent b539523422 d442c44564
commit 21f4e4162f
6 changed files with 68 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/game/objects/items/storage/tailbag.dm
-122
View File
@@ -1,122 +0,0 @@
/obj/item/storage/tailbag
name = "tailbag"
desc = "A bag for holding small items. It fastens around the base of the tail."
icon = 'modular_splurt/icons/obj/storage.dmi'
icon_state = "tailbag"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_ID
var/obj/item/card/id/front_id = null
var/list/combined_access
/obj/item/storage/tailbag/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power))
STR.can_hold = typecacheof(list(
/obj/item/stack/spacecash,
/obj/item/holochip,
/obj/item/card,
/obj/item/clothing/mask/cigarette,
/obj/item/flashlight/pen,
/obj/item/seeds,
/obj/item/stack/medical,
/obj/item/toy/crayon,
/obj/item/coin,
/obj/item/dice,
/obj/item/disk,
/obj/item/implanter,
/obj/item/lighter,
/obj/item/lipstick,
/obj/item/match,
/obj/item/paper,
/obj/item/pen,
/obj/item/photo,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/syringe,
/obj/item/screwdriver,
/obj/item/multitool,
/obj/item/wrench,
/obj/item/wirecutters,
/obj/item/valentine,
/obj/item/stamp,
/obj/item/key,
/obj/item/cartridge,
/obj/item/camera_film,
/obj/item/stack/ore/bluespace_crystal,
/obj/item/reagent_containers/food/snacks/grown/poppy,
/obj/item/instrument/harmonica,
/obj/item/mining_voucher,
/obj/item/suit_voucher,
/obj/item/reagent_containers/pill,
/obj/item/gun/ballistic/derringer,
/obj/item/genital_equipment/condom,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash,
/obj/item/laser_pointer,
/obj/item/pda,
/obj/item/paicard))
/obj/item/storage/tailbag/Exited(atom/movable/AM)
. = ..()
refreshID()
/obj/item/storage/tailbag/proc/refreshID()
LAZYCLEARLIST(combined_access)
if(!(front_id in src))
front_id = null
for(var/obj/item/card/id/I in contents)
if(!front_id)
front_id = I
LAZYINITLIST(combined_access)
combined_access |= I.access
update_icon()
/obj/item/storage/tailbag/Entered(atom/movable/AM)
. = ..()
refreshID()
/obj/item/storage/tailbag/update_icon_state()
var/new_state = "tailbag"
if(front_id)
new_state = "tailbag_id"
if(new_state != icon_state) //avoid so many icon state changes.
icon_state = new_state
/obj/item/storage/tailbag/GetID()
return front_id
/obj/item/storage/tailbag/RemoveID()
if(!front_id)
return
. = front_id
front_id.forceMove(get_turf(src))
/obj/item/storage/tailbag/InsertID(obj/item/inserting_item)
var/obj/item/card/inserting_id = inserting_item.RemoveID()
if(!inserting_id)
return FALSE
attackby(inserting_id)
if(inserting_id in contents)
return TRUE
return FALSE
/obj/item/storage/tailbag/GetAccess()
if(LAZYLEN(combined_access))
return combined_access
else
return ..()
/obj/item/storage/tailbag/xtralg
name = "XL Tailbag"
desc = "A larger tail bag for larger creatures"
icon = 'modular_splurt/icons/obj/storage.dmi'
icon_state = "tailbag_xl"
/obj/item/storage/tailbag/xtralg/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 8
modular_splurt/code/game/objects/items/storage/wallets.dm
+40
View File
@@ -18,3 +18,43 @@
/obj/item/storage/wallet/bluespace/update_icon_state()
// Don't update icons
return
// Tailbags
/obj/item/storage/wallet/tailbag
name = "tailbag"
desc = "A bag for holding small items. It fastens around the base of the tail."
icon = 'modular_splurt/icons/obj/storage.dmi'
icon_state = "tailbag"
/obj/item/storage/wallet/tailbag/update_icon_state()
// Don't update icons
return
/obj/item/storage/wallet/tailbag/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
STR.can_hold += typecacheof(list( // Extra items that can go in tailbags, more than wallets
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash,
/obj/item/laser_pointer,
/obj/item/pda,
/obj/item/paicard
))
/obj/item/storage/wallet/tailbag/xtralg
name = "XL Tailbag"
desc = "A larger tail bag for larger creatures"
icon = 'modular_splurt/icons/obj/storage.dmi'
icon_state = "tailbag_xl"
/obj/item/storage/wallet/tailbag/xtralg/update_icon_state()
// Don't update icons
return
/obj/item/storage/wallet/tailbag/xtralg/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 8
//