Skip to content

Commit

Permalink
возвращает мусор (#9491)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndroBetel committed Jun 29, 2022
1 parent 5c27c86 commit 7af7b5a
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 56 deletions.
17 changes: 5 additions & 12 deletions code/game/objects/random/random_scrap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
/obj/random/scrap/dense_even
name = "Random dense even trash"
desc = "This is a random trash."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/dense_even/item_to_spawn()
return pick(\
/obj/structure/scrap/large,\
Expand All @@ -20,8 +19,7 @@
/obj/random/scrap/dense_weighted
name = "Random dense weighted trash"
desc = "This is a random trash."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/dense_weighted/item_to_spawn()
return pick(\
prob(70);/obj/structure/scrap/poor/large,\
Expand All @@ -39,8 +37,7 @@
/obj/random/scrap/sparse_even
name = "Random sparse even trash"
desc = "This is a random trash."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/sparse_even/item_to_spawn()
return pick(\
/obj/structure/scrap,\
Expand All @@ -56,8 +53,6 @@
/obj/random/scrap/sparse_weighted
name = "Random sparse weighted trash"
desc = "This is a random trash."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/sparse_weighted/item_to_spawn()
var/holiday_prob = 0
Expand All @@ -79,8 +74,7 @@
/obj/random/scrap/moderate_weighted
name = "Random moderate weighted trash"
desc = "This is a random tool."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/moderate_weighted/item_to_spawn()
return pick(\
prob(2);/obj/random/scrap/sparse_weighted,\
Expand All @@ -90,8 +84,7 @@
/obj/random/scrap/safe_even
name = "Random safe even trash"
desc = "This is a random trash."
icon = 'icons/obj/items.dmi'
icon_state = "welder"

/obj/random/scrap/safe_even/item_to_spawn()
var/holiday_prob = 0
if(SSholiday.holidays[NEW_YEAR])
Expand Down
Loading

0 comments on commit 7af7b5a

Please sign in to comment.