Bible refactor (#75350)

## About The Pull Request This started as a simple addition where burning a bible would curse you, but then I realized... Bibles aren't even proper books, thus can't be burned! So yeah, since that is not necessary due to how atom_storage works, I reworked that. ## Why It's Good For The Game Because burning bibles and getting cursed for it is funny. ![image](https://github.com/tgstation/tgstation/assets/82850673/2a8489ce-ecd6-45ee-9eb9-168ff820af65) ![image](https://github.com/tgstation/tgstation/assets/82850673/ebe98ad6-2d0d-4d20-9ea1-5d472d6ca465) ## Changelog :cl: add: You can burn bibles now! But heresy has a steep cost... /:cl: --------- Co-authored-by: san7890 <the@san7890.com>
tgstation · May 15, 2023 · dff7062 · dff7062
1 parent 8eb5299
commit dff7062
Show file tree

Hide file tree

Showing 48 changed files with 692 additions and 526 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
@@ -185,7 +185,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/storage/book/bible{
+/obj/item/book/bible{
 	pixel_y = 5
 	},
 /obj/item/flashlight/flare/candle{

diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm
@@ -180,7 +180,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space)
 "Q" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/decal/cleanable/blood,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)

diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -9,7 +9,7 @@
 "ae" = (
 /obj/structure/table,
 /obj/machinery/light/small/directional/west,
-/obj/item/storage/book/bible{
+/obj/item/book/bible{
 	pixel_x = 3
 	},
 /obj/item/book/manual/wiki/cytology{

diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -1011,7 +1011,7 @@
 /area/ruin/space/ks13/hallway/aft)
 "oC" = (
 /obj/structure/table/wood,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
 /obj/structure/cable,

diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
@@ -9562,7 +9562,7 @@
 /area/station/engineering/atmos)
 "dSQ" = (
 /obj/structure/table/wood,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/machinery/light/small/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark/smooth_edge{
@@ -15505,7 +15505,7 @@
 /area/station/ai_monitored/turret_protected/aisat/maint)
 "fZC" = (
 /obj/structure/table/wood,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark/smooth_edge,
 /area/station/maintenance/starboard/greater)
@@ -64949,7 +64949,7 @@
 /area/station/cargo/office)
 "wzx" = (
 /obj/structure/altar_of_gods,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/carpet/lone,
 /area/station/service/chapel/office)
 "wzK" = (

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -11355,7 +11355,7 @@
 /area/station/maintenance/port/fore)
 "cKr" = (
 /obj/structure/table/wood/fancy,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/funeral)
@@ -84913,7 +84913,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos/mix)
 "vkr" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/altar_of_gods,
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel)

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -7798,7 +7798,7 @@
 "cvv" = (
 /obj/structure/table/wood,
 /obj/machinery/airalarm/directional/north,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
@@ -19362,7 +19362,7 @@
 /turf/open/floor/eighties/red,
 /area/station/security/prison/safe)
 "gcP" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -30671,7 +30671,7 @@
 	pixel_x = -7;
 	pixel_y = 3
 	},
-/obj/item/storage/book{
+/obj/item/book{
 	name = "Tales from the First";
 	pixel_x = 5;
 	pixel_y = 5
@@ -47616,7 +47616,7 @@
 /area/station/security/prison)
 "peA" = (
 /obj/structure/table/wood,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/office)
 "peV" = (
@@ -54534,7 +54534,7 @@
 /area/station/cargo/lobby)
 "rqR" = (
 /obj/structure/table/glass,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/iron/chapel,
 /area/station/service/chapel)
 "rqT" = (
@@ -75984,7 +75984,7 @@
 "ygp" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/altar_of_gods,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3729,7 +3729,7 @@
 	desc = "A memorial wall for pinning mementos upon.";
 	name = "memorial board"
 	},
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/table/wood,
 /turf/open/floor/carpet,
 /area/station/service/chapel/funeral)
@@ -42991,7 +42991,7 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
 "pwq" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/altar_of_gods,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
@@ -51281,7 +51281,7 @@
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
 "ssi" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/machinery/light/small/directional/north,
 /obj/machinery/newscaster/directional/north,
 /obj/machinery/camera/directional/north{

diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
@@ -33588,7 +33588,7 @@
 "iUE" = (
 /obj/structure/altar_of_gods,
 /obj/effect/turf_decal/siding/white,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/mineral/silver,
 /area/station/service/chapel)
 "iUP" = (
@@ -65637,7 +65637,7 @@
 /area/station/service/library)
 "rdu" = (
 /obj/structure/table/bronze,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/iron,
 /area/station/service/chapel)
 "rdx" = (

diff --git a/_maps/map_files/tramstation/maintenance_modules/dormmedupper_attachment_a_3.dmm b/_maps/map_files/tramstation/maintenance_modules/dormmedupper_attachment_a_3.dmm
@@ -6,12 +6,12 @@
 "h" = (
 /obj/structure/rack,
 /obj/structure/window/spawner/directional/east,
-/obj/item/storage/book/bible{
+/obj/item/book/bible{
 	pixel_x = -4;
 	pixel_y = -4
 	},
-/obj/item/storage/book/bible,
-/obj/item/storage/book/bible{
+/obj/item/book/bible,
+/obj/item/book/bible{
 	pixel_x = 4;
 	pixel_y = 4
 	},

diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
@@ -6777,7 +6777,7 @@
 /turf/open/floor/plating,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
 "aQc" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/altar_of_gods,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
@@ -42948,7 +42948,7 @@
 "ohW" = (
 /obj/structure/table/wood,
 /obj/machinery/light/dim/directional/north,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/carpet,
 /area/station/service/chapel/monastery)
 "ohY" = (
@@ -63100,7 +63100,7 @@
 "vrd" = (
 /obj/structure/table/wood,
 /obj/machinery/firealarm/directional/north,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/iron/chapel{
 	dir = 9
 	},

diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
@@ -694,7 +694,7 @@
 /area/shuttle/escape)
 "LM" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/book/bible/booze{
+/obj/item/book/bible/booze{
 	pixel_x = -3;
 	pixel_y = 4
 	},

diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
@@ -1612,9 +1612,9 @@
 "yr" = (
 /obj/structure/closet,
 /obj/machinery/light/small/directional/south,
-/obj/item/storage/book/bible,
-/obj/item/storage/book/bible,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
+/obj/item/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "yu" = (
@@ -2037,7 +2037,7 @@
 /turf/open/misc/asteroid,
 /area/shuttle/escape)
 "Dv" = (
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/structure/cable,
 /obj/structure/altar_of_gods,
 /turf/open/floor/carpet,
@@ -3211,7 +3211,7 @@
 /area/shuttle/escape)
 "Si" = (
 /obj/structure/table/wood/fancy,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/carpet,
 /area/shuttle/escape)
 "Sj" = (

diff --git a/_maps/templates/holodeck_chapelcourt.dmm b/_maps/templates/holodeck_chapelcourt.dmm
@@ -190,7 +190,7 @@
 /area/template_noop)
 "au" = (
 /obj/structure/table/wood/fancy,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -495,7 +495,7 @@
 /area/template_noop)
 "kv" = (
 /obj/structure/table/wood/fancy,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/holofloor/dark,
 /area/template_noop)

diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm
@@ -122,7 +122,7 @@
 /area/centcom/central_command_areas/holding)
 "dj" = (
 /obj/structure/table/wood/fancy/royalblack,
-/obj/item/storage/book/bible,
+/obj/item/book/bible,
 /turf/open/floor/wood/large,
 /area/centcom/central_command_areas/holding)
 "dy" = (

diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm
@@ -45,6 +45,7 @@
 #define MEDAL_NARSUPREME "Narsupreme"
 #define MEDAL_SPRINGLOCK "The Man Inside the Modsuit"
 #define MEDAL_HEALTHY "Heart Healthy"
+#define MEDAL_GODS_WRATH "God's Wrath"
 
 //Skill medal hub IDs
 #define MEDAL_LEGENDARY_MINER "Legendary Miner"

diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -171,7 +171,7 @@
 ///from [/obj/structure/closet/supplypod/proc/preOpen]:
 #define COMSIG_SUPPLYPOD_LANDED "supplypodgoboom"
 
-///from /obj/item/storage/book/bible/afterattack(): (mob/user, proximity)
+///from /obj/item/book/bible/afterattack(): (mob/user, proximity)
 #define COMSIG_BIBLE_SMACKED "bible_smacked"
 	///stops the bible chain from continuing. When all of the effects of the bible smacking have been moved to a signal we can kill this
 	#define COMSIG_END_BIBLE_CHAIN (1<<0)

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 GLOBAL_LIST_INIT(book_types, typecacheof(list(
 	/obj/item/book,
 	/obj/item/spellbook,
-	/obj/item/storage/book)))
+)))
 
 // Jobs
 #define is_job(job_type)  (istype(job_type, /datum/job))

diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm
@@ -217,3 +217,9 @@
 	desc = "Don't be such a baby, it's just a heart attack. You've bounced back from worse!"
 	database_id = MEDAL_HEALTHY
 	icon = "picofhealth"
+
+/datum/award/achievement/misc/gods_wrath
+	name = "God's Wrath"
+	desc = "Did you think you could get away with defiling the word of God?"
+	database_id = MEDAL_GODS_WRATH
+	icon = "godswrath"
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
@@ -268,7 +268,7 @@
 	time = 1 SECONDS
 	tool_paths = list(
 		/obj/item/clothing/suit/hooded/chaplain_hoodie,
-		/obj/item/storage/book/bible,
+		/obj/item/book/bible,
 	)
 	reqs = list(/obj/item/stack/sheet/cloth = 4)
 	category = CAT_CLOTHING