Skip to content

Commit

Permalink
Merge pull request Baystation12#34703 from gy1ta23/trinkets
Browse files Browse the repository at this point in the history
adds photograph to loadout
  • Loading branch information
Spookerton authored Jul 8, 2024
2 parents 58a5227 + 8274cc9 commit ad4f2e6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
7 changes: 7 additions & 0 deletions code/modules/paperwork/photography.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ var/global/photo_count = 0
add_fingerprint(usr)
return

/obj/item/phototrinket
name = "photo"
icon = 'icons/obj/tools/photography.dmi'
desc = "A blank photograph. You feel, for some reason, that someone (or something) has forgotten to... describe it?"
icon_state = "photo"
item_state = "paper"
w_class = ITEM_SIZE_TINY

/**************
* photo album *
Expand Down
9 changes: 7 additions & 2 deletions maps/torch/loadout/loadout_misc.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
/datum/gear/trinket/photograph
display_name = "photo"
description = "A definable photograph. The only limit is your imagination."
path = /obj/item/phototrinket

/datum/gear/trinket/scg_challenge_coin
display_name = "sol challenge coin selection"
description = "A selection of challenge coins for identification, collection or simply bragging rights"
description = "A selection of challenge coins for identification, collection or simply bragging rights."
path = /obj/item/material/coin/challenge
cost = 1

Expand All @@ -20,7 +25,7 @@

/datum/gear/trinket/misc_challenge_coin
display_name = "misc challenge coin selection"
description = "A selection of challenge coins for identification, collection or simply bragging rights"
description = "A selection of challenge coins for identification, collection or simply bragging rights."
path = /obj/item/material/coin/challenge/misc
cost = 1

Expand Down

0 comments on commit ad4f2e6

Please sign in to comment.