Skip to content

Commit

Permalink
Merge pull request #2624 from ARF-SS13/wallyworld
Browse files Browse the repository at this point in the history
Dvd player and DVDs
  • Loading branch information
Tk420634 authored Jul 12, 2023
2 parents b5ddcde + 2c3f662 commit acb9fcc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/objects/effects/spawners/masterlootdrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1683,5 +1683,6 @@
/obj/item/reagent_containers/syringe = 5,
/obj/item/restraints/handcuffs = 5,
/obj/item/toy/crayon/spraycan = 5,
/obj/item/laser_pointer = 5
/obj/item/laser_pointer = 5,
/obj/item/coin/dvd = 5
)
12 changes: 12 additions & 0 deletions modular_coyote/code/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -492,3 +492,15 @@
desc = "A rather nice looking sink. How quint."
icon = 'modular_coyote/icons/objects/miscellaneous.dmi'
icon_state = "sink"

/obj/structure/dvd_player
name = "Dvd Player"
desc = "An old and dusty looking machine. Maybe it even still works.."
icon = 'modular_coyote/icons/objects/miscellaneous.dmi'
icon_state = "dvd_player"

/obj/item/coin/dvd
name = "Dvd"
desc = "A shiny disk! Don't scratch it."
icon = 'modular_coyote/icons/objects/items.dmi'
icon_state = "dvd"
Binary file modified modular_coyote/icons/objects/miscellaneous.dmi
Binary file not shown.

0 comments on commit acb9fcc

Please sign in to comment.