yea

Mojave-Sun · Sep 25, 2023 · ca21816 · ca21816
1 parent be7a9f2
commit ca21816
Show file tree

Hide file tree

Showing 11 changed files with 252 additions and 51 deletions.
diff --git a/_maps/map_files/Drought/Drought.dmm b/_maps/map_files/Drought/Drought.dmm
@@ -202,7 +202,7 @@
 /turf/open/floor/plating/ms13/ground/desertalt,
 /area/ms13/desert)
 "akS" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 1
 	},
 /obj/structure/table/ms13/metal/grate,
@@ -1671,7 +1671,7 @@
 	pixel_x = 10;
 	pixel_y = 3
 	},
-/obj/item/ms13/fluff/burnt_book,
+/obj/item/ms13/fluff/ruined_book,
 /obj/structure/ms13/foundation/mosaic/variantone{
 	dir = 6
 	},
@@ -3622,7 +3622,7 @@
 	pixel_x = -11;
 	pixel_y = -1
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -9;
 	pixel_y = 10
 	},
@@ -3957,7 +3957,7 @@
 /obj/structure/table/ms13/no_smooth/counter/metal/bend{
 	dir = 8
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -11;
 	pixel_y = 4
 	},
@@ -4257,7 +4257,7 @@
 /area/ms13/town)
 "eUc" = (
 /obj/structure/table/ms13/no_smooth/wood/low,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = 10;
 	pixel_y = 4
 	},
@@ -6416,7 +6416,7 @@
 /obj/structure/table/ms13/no_smooth/counter/wood{
 	dir = 8
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 3
 	},
 /obj/structure/ms13/trash/papers{
@@ -11202,7 +11202,7 @@
 /obj/item/ms13/fluff/alarmclock{
 	pixel_y = 10
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -10;
 	pixel_y = 3
 	},
@@ -17028,7 +17028,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/town)
 "tyD" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = -7
 	},
 /obj/structure/ms13/trash/papers{

diff --git a/_maps/map_files/Drought/Drought_above.dmm b/_maps/map_files/Drought/Drought_above.dmm
@@ -1979,7 +1979,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/water_baron/interior)
 "gP" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 3
 	},
 /obj/structure/ms13/trash/papers{
@@ -2585,7 +2585,7 @@
 /turf/open/floor/ms13/concrete/industrial,
 /area/ms13/town)
 "iM" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = -11
 	},
 /obj/structure/ms13/trash/papers{
@@ -4445,7 +4445,7 @@
 /turf/open/floor/wood/ms13/carpet,
 /area/ms13/town)
 "ph" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 3
 	},
 /obj/structure/table/ms13/no_smooth/wood/stand,
@@ -5948,7 +5948,7 @@
 	pixel_x = -2;
 	pixel_y = 7
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = 10;
 	pixel_y = 3
 	},
@@ -6921,7 +6921,7 @@
 /obj/structure/ms13/rug/red{
 	dir = 4
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -11;
 	pixel_y = 16
 	},
@@ -13265,7 +13265,7 @@
 	pixel_x = 5;
 	pixel_y = -8
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = -6
 	},
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -13441,7 +13441,7 @@
 	pixel_y = 5
 	},
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = 10;
 	pixel_y = 3
 	},
@@ -14231,7 +14231,7 @@
 /turf/open/floor/wood/ms13/wide,
 /area/ms13/drylanders/building)
 "Xg" = (
-/obj/item/ms13/fluff/burnt_book,
+/obj/item/ms13/fluff/ruined_book,
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
 /turf/open/floor/ms13/tile,
 /area/ms13/town)

diff --git a/_maps/map_files/Drought/Drought_below.dmm b/_maps/map_files/Drought/Drought_below.dmm
@@ -2949,7 +2949,7 @@
 /area/ms13/town)
 "ui" = (
 /obj/structure/table/ms13/no_smooth/cable_reel,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 6
 	},
 /obj/item/trash/ms13/candle{
@@ -2965,10 +2965,10 @@
 /area/ms13/town)
 "uj" = (
 /obj/structure/closet/crate/ms13/woodcrate/compact,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 6
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 6
 	},
 /turf/open/floor/plating/ms13/ground/desertalt,
@@ -3277,7 +3277,7 @@
 /area/ms13/town)
 "wl" = (
 /obj/structure/ms13/rug,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 6
 	},
 /obj/structure/table/ms13/no_smooth/cable_reel,
@@ -4212,7 +4212,7 @@
 /obj/item/candle/ms13{
 	pixel_y = 10
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -8;
 	pixel_y = 6
 	},
@@ -6251,7 +6251,7 @@
 /area/ms13/town)
 "Rf" = (
 /obj/structure/table/ms13/no_smooth/cable_reel,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = 9;
 	pixel_y = 4
 	},
@@ -7216,7 +7216,7 @@
 	pixel_x = 6;
 	pixel_y = 16
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -11;
 	pixel_y = 16
 	},

diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini.dmm
@@ -23969,7 +23969,7 @@
 /obj/structure/ms13/pallet/stack{
 	dir = 1
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 7
 	},
 /turf/open/floor/wood/ms13/common,

diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_above.dmm
@@ -16683,7 +16683,7 @@
 /area/ms13/town)
 "ufB" = (
 /obj/structure/table/ms13/wood,
-/obj/item/ms13/fluff/burnt_book,
+/obj/item/ms13/fluff/ruined_book,
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
 /turf/open/floor/wood/ms13/carpet/shaggy,
 /area/ms13/snowcrest/building)

diff --git a/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm b/_maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm
@@ -8335,7 +8335,7 @@
 /area/ms13/underground/sewer)
 "gZt" = (
 /obj/structure/table/ms13/no_smooth/cable_reel,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 7
 	},
 /obj/item/reagent_containers/food/drinks/bottle/ms13/trooper_beer{
@@ -8589,7 +8589,7 @@
 /area/ms13/underground/underground_town)
 "hQr" = (
 /obj/structure/table/ms13/no_smooth/cable_reel,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 4
 	},
 /obj/item/ms13/fluff/ashtray{
@@ -9250,7 +9250,7 @@
 	pixel_x = 5;
 	pixel_y = 13
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 1
 	},
 /obj/item/candle/ms13{
@@ -9440,7 +9440,7 @@
 /area/ms13/underground/underground_town)
 "jPV" = (
 /obj/structure/table/ms13/no_smooth/cable_reel,
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 7
 	},
 /obj/item/reagent_containers/food/drinks/bottle/ms13/whiskey{
@@ -10309,7 +10309,7 @@
 	pixel_x = -9;
 	pixel_y = 7
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 7
 	},
 /turf/open/floor/ms13/concrete,
@@ -10700,7 +10700,7 @@
 	pixel_x = 11;
 	pixel_y = 9
 	},
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_y = 7
 	},
 /obj/item/candle/ms13{
@@ -12725,7 +12725,7 @@
 /turf/open/floor/ms13/metal,
 /area/ms13/underground/sewer)
 "sbl" = (
-/obj/item/ms13/fluff/burnt_book{
+/obj/item/ms13/fluff/ruined_book{
 	pixel_x = -3
 	},
 /turf/open/floor/ms13/concrete,

diff --git a/mojave/icons/objects/clutter/clutter_inventory.dmi b/mojave/icons/objects/clutter/clutter_inventory.dmi
diff --git a/mojave/icons/objects/clutter/clutter_world.dmi b/mojave/icons/objects/clutter/clutter_world.dmi
diff --git a/mojave/icons/structure/miscellaneous.dmi b/mojave/icons/structure/miscellaneous.dmi
diff --git a/mojave/items/misc/fluff.dm b/mojave/items/misc/fluff.dm
@@ -10,26 +10,14 @@
 /obj/item/ms13/fluff/ruined_book
 	name = "ruined book"
 	desc = "A book that's been rendered unreadable from decades of decay."
-	icon_state = "book"
+	icon_state = "book_1"
 	drop_sound = 'sound/items/handling/book_drop.ogg'
 	pickup_sound = 'sound/items/handling/book_pickup.ogg'
 
 /obj/item/ms13/fluff/ruined_book/Initialize(mapload)
 	. = ..()
-	icon_state = pick("book2","book3","book4","book5","book6")
-	AddElement(/datum/element/craftable, /obj/item/knife/ms13, /obj/item/paper/ms13, rand(1,5), 30 SECONDS, crafting_sound_start = 'mojave/sound/ms13effects/book_open.ogg', crafting_focus_sound = list('mojave/sound/ms13effects/crafting/scissorsnip1.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip2.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip3.ogg' = 1))
-
-/obj/item/ms13/fluff/burnt_book
-	name = "burnt book"
-	desc = "A book that's been rendered unreadable due to severe burns."
-	icon_state = "book_burnt"
-	drop_sound = 'sound/items/handling/book_drop.ogg'
-	pickup_sound = 'sound/items/handling/book_pickup.ogg'
-
-/obj/item/ms13/fluff/burnt_book/Initialize(mapload) //huge shoutout to techno for making all of these seperate
-	. = ..()
-	icon_state = pick("book_burnt2","book_burnt3")
-	AddElement(/datum/element/craftable, /obj/item/knife/ms13, /obj/item/paper/ms13, rand(1,3), 30 SECONDS, crafting_sound_start = 'mojave/sound/ms13effects/book_open.ogg', crafting_focus_sound = list('mojave/sound/ms13effects/crafting/scissorsnip1.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip2.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip3.ogg' = 1))
+	icon_state = pick("book_1","book_2","book_3","book_4")
+	AddElement(/datum/element/craftable, /obj/item/knife/ms13, /obj/item/paper/ms13, rand(1,5), 20 SECONDS, crafting_sound_start = 'mojave/sound/ms13effects/book_open.ogg', crafting_focus_sound = list('mojave/sound/ms13effects/crafting/scissorsnip1.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip2.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip3.ogg' = 1))
 
 /obj/item/ms13/fluff/bible
 	name = "bible"
@@ -40,7 +28,7 @@
 
 /obj/item/ms13/fluff/bible/Initialize(mapload)
 	. = ..()
-	AddElement(/datum/element/craftable, /obj/item/knife/ms13, /obj/item/paper/ms13, rand(1,6), 30 SECONDS, crafting_sound_start = 'mojave/sound/ms13effects/book_open.ogg', crafting_focus_sound = list('mojave/sound/ms13effects/crafting/scissorsnip1.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip2.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip3.ogg' = 1))
+	AddElement(/datum/element/craftable, /obj/item/knife/ms13, /obj/item/paper/ms13, rand(1,6), 20 SECONDS, crafting_sound_start = 'mojave/sound/ms13effects/book_open.ogg', crafting_focus_sound = list('mojave/sound/ms13effects/crafting/scissorsnip1.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip2.ogg' = 1, 'mojave/sound/ms13effects/crafting/scissorsnip3.ogg' = 1))
 
 /obj/item/ms13/fluff/typewriter
 	name = "typewriter"