Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix typo mistake from matchs to matches. #4073

Merged
merged 5 commits into from
Aug 12, 2023
Merged

fix typo mistake from matchs to matches. #4073

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c1db2d
fix typo mystake for all the matches.
Aug 1, 2023
a7c9d73
change .len to length()
Aug 3, 2023
10e0ecc
Update code/game/objects/items/storage/fancy.dm
Huffie56 Aug 3, 2023
f799ef5
cleanup.
Aug 4, 2023
be737f0
this is the way
Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 23 additions & 29 deletions code/game/objects/items/storage/fancy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* Crayon Box
* Cigarette Box
* Cigar Box
* Match Box
* Vial Box
*/

/obj/item/storage/fancy
Expand All @@ -20,9 +22,10 @@
name = "donut box"
desc = "A box where round, heavenly, holey pastries reside."
var/icon_type = "donut"
var/plural = "s"

/obj/item/storage/fancy/update_icon()
icon_state = "[icon_type]box[contents.len]"
icon_state = "[icon_type]box[length(contents)]"

/obj/item/storage/fancy/remove_from_storage(obj/item/W, atom/new_location)
. = ..()
Expand All @@ -32,17 +35,14 @@

/obj/item/storage/fancy/get_examine_text(mob/user)
. = ..()
if(contents.len <= 0)
. += "There are no [src.icon_type]s left in the box."
else if(contents.len == 1)
if(!length(contents))
. += "There are no [src.icon_type][plural] left in the box."
else if(length(contents) == 1)
. += "There is one [src.icon_type] left in the box."
else
. += "There are [src.contents.len] [src.icon_type]s in the box."

. += "There are [length(src.contents)] [src.icon_type][plural] in the box."

/*
* Egg Box
*/
// EGG BOX

/obj/item/storage/fancy/egg_box
icon = 'icons/obj/items/food.dmi'
Expand All @@ -59,9 +59,7 @@
new /obj/item/reagent_container/food/snacks/egg(src)
return

/*
* Candle Box
*/
// CANDLE BOX

/obj/item/storage/fancy/candle_box
name = "candle pack"
Expand All @@ -80,9 +78,7 @@
new /obj/item/tool/candle(src)
return

/*
* Crayon Box
*/
// CRAYON BOX

/obj/item/storage/fancy/crayons
name = "box of crayons"
Expand Down Expand Up @@ -120,9 +116,8 @@
return
..()

////////////
//CIG PACK//
////////////
// CIGARETTES BOX

/obj/item/storage/fancy/cigarettes
icon = 'icons/obj/items/cigarettes.dmi'
icon_state = "cigpacket"
Expand Down Expand Up @@ -153,14 +148,14 @@
icon_state = "[initial(icon_state)]"

/obj/item/storage/fancy/cigarettes/update_icon()
icon_state = "[initial(icon_state)][contents.len]"
icon_state = "[initial(icon_state)][length(contents)]"
return

/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M, /mob))
return

if(M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask)
if(M == user && user.zone_selected == "mouth" && length(contents) > 0 && !user.wear_mask)
var/obj/item/clothing/mask/cigarette/C = locate() in src
if(C)
remove_from_storage(C, get_turf(user))
Expand Down Expand Up @@ -223,9 +218,7 @@
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
storage_slots = 4

/////////////
//CIGAR BOX//
/////////////
// CIGAR BOX

/obj/item/storage/fancy/cigar
name = "cigar case"
Expand Down Expand Up @@ -253,14 +246,14 @@
icon_state = "[initial(icon_state)]"

/obj/item/storage/fancy/cigar/update_icon()
icon_state = "[initial(icon_state)][contents.len]"
icon_state = "[initial(icon_state)][length(contents)]"
return

/obj/item/storage/fancy/cigar/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M, /mob))
return

if(M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask)
if(M == user && user.zone_selected == "mouth" && length(contents) > 0 && !user.wear_mask)
var/obj/item/clothing/mask/cigarette/cigar/C = locate() in src
if(C)
remove_from_storage(C, get_turf(user))
Expand All @@ -286,6 +279,8 @@
storage_slots = 1
default_cigar_type = /obj/item/clothing/mask/cigarette/cigar/tarbacks

// MATCH BOX

/obj/item/storage/fancy/cigar/matchbook
name = "\improper Lucky Strikes matchbook"
desc = "A small book of cheap paper matches. Good luck getting them to light. Made by Lucky Strikes, but you'll be anything but lucky when you burn your hand trying to light a match on this."
Expand All @@ -298,6 +293,7 @@
w_class = SIZE_TINY
var/light_chance = 70 //how likely you are to light the match on the book
var/burn_chance = 20 //how likely you are to burn yourself once you light it
plural = "es"

/obj/item/storage/fancy/cigar/matchbook/attackby(obj/item/tool/match/W as obj, mob/living/carbon/human/user as mob)
if(!istype(user))
Expand Down Expand Up @@ -340,9 +336,7 @@
light_chance = 60
burn_chance = 40

/*
* Vial Box
*/
// VIAL BOX

/obj/item/storage/fancy/vials
icon = 'icons/obj/items/vialbox.dmi'
Expand Down Expand Up @@ -401,7 +395,7 @@
req_access = list(ACCESS_MARINE_MEDBAY)

/obj/item/storage/lockbox/vials/update_icon(itemremoved = 0)
var/total_contents = src.contents.len - itemremoved
var/total_contents = length(src.contents) - itemremoved
src.icon_state = "vialbox[total_contents]"
src.overlays.Cut()
if (!broken)
Expand Down