Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: harryob <[email protected]>
  • Loading branch information
Warfan1815 and harryob authored Feb 22, 2024
1 parent 7e23219 commit 7b3b09d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions code/game/objects/items/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
flags_atom |= NOREACT
for(var/i = 1 to (storage_slots-1))
new default_cig_type(src)
trading_card = new /obj/item/toy/trading_card(src)
trading_card = new(src)

/obj/item/storage/fancy/cigarettes/trading_card/attack_hand(mob/user, mods)
if(trading_card?.loc == src && loc == user)
Expand All @@ -249,9 +249,9 @@

. = ..()

/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/toy/trading_card))
trading_card = W
/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/attacked_by_item, mob/user)
if(istype(attacked_by_item, /obj/item/toy/trading_card))
trading_card = attacked_by_item

. = ..()

Expand Down Expand Up @@ -477,14 +477,14 @@

/obj/item/storage/fancy/trading_card/fill_preset_inventory()

for(var/i = 1, i <= storage_slots, i++)
for(var/i in 1 to storage_slots)
top_trading_card = new /obj/item/toy/trading_card(src)

/obj/item/storage/fancy/trading_card/update_icon()
if(!(top_trading_card))
icon_state = "trading_[collection_color]_pack_empty"
return
if(length(contents) == 5)
if(length(contents) == storage_slots)
icon_state = "trading_[collection_color]_pack_closed"
return
icon_state = "trading_[collection_color]_pack_open"
Expand All @@ -505,9 +505,9 @@

. = ..()

/obj/item/storage/fancy/trading_card/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/toy/trading_card))
top_trading_card = W
/obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user)
if(istype(attackd_by_item, /obj/item/toy/trading_card))
top_trading_card = attacked_by_item

. = ..()

Expand Down

0 comments on commit 7b3b09d

Please sign in to comment.