mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Burning paper (and similar) is now two way (you can hold a paper to your cigarette to burn it) (#90307)
## About The Pull Request 1. Burning paper (and similar) is now two way - rather than necessitating you touch the paper with the burning thing, you can now touch the burning thing with the paper 2. You can now light a cigarette on a lit candle 3. Candles no longer craft into flashlight eyes ## Why It's Good For The Game 1. Burning money with a cigarette larp 2. Cool Frenchman larp 3. ??? I noticed you can't light a candle with a candle because it tried to craft flashlight eyes. ## Changelog 🆑 Melbert qol: Burning paper (and similar) is now two way. Rather than needing to click on the paper with a burning item, you can now click on a burning item with the paper. This means you can burn paper on your lit cigarette like a badass. qol: You can now light cigarettes on candles. del: Flares and candles can no longer craft into flashlight eyes, I guess. /🆑
This commit is contained in:
@@ -87,6 +87,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
|
||||
on_intercepted = CALLBACK(src, PROC_REF(on_intercepted_bullet)),\
|
||||
block_charges = 1,\
|
||||
)
|
||||
RegisterSignal(src, COMSIG_ATOM_IGNITED_BY_ITEM, PROC_REF(curse_heathen))
|
||||
|
||||
/// Destroy the bible when it's shot by a bullet
|
||||
/obj/item/book/bible/proc/on_intercepted_bullet(mob/living/victim, obj/projectile/bullet)
|
||||
@@ -113,22 +114,22 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
|
||||
else
|
||||
. += span_notice("[src] can be unpacked by hitting the floor of a holy area with it.")
|
||||
|
||||
/obj/item/book/bible/burn_paper_product_attackby_check(obj/item/attacking_item, mob/living/user, bypass_clumsy)
|
||||
. = ..()
|
||||
/obj/item/book/bible/proc/curse_heathen(datum/source, mob/living/user, obj/item/burning_tool)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
// no deity to cast a curse upon thee
|
||||
if(!deity_name)
|
||||
return
|
||||
if(. && (resistance_flags & ON_FIRE))
|
||||
var/datum/component/omen/existing_omen = user.GetComponent(/datum/component/omen)
|
||||
//DOUBLE CURSED?! Just straight up gib the guy.
|
||||
if(existing_omen)
|
||||
to_chat(user, span_userdanger("[deity_name] <b>SMITE</b> thee!"))
|
||||
add_memory_in_range(user, 7, /datum/memory/witnessed_gods_wrath, protagonist = user, deuteragonist = src, antagonist = deity_name)
|
||||
user.client?.give_award(/datum/award/achievement/misc/gods_wrath, user)
|
||||
user.gib(DROP_ALL_REMAINS)
|
||||
else
|
||||
to_chat(user, span_userdanger("[deity_name] cast a curse upon thee!"))
|
||||
user.AddComponent(/datum/component/omen/bible)
|
||||
var/datum/component/omen/existing_omen = user.GetComponent(/datum/component/omen)
|
||||
//DOUBLE CURSED?! Just straight up gib the guy.
|
||||
if(existing_omen)
|
||||
to_chat(user, span_userdanger("[deity_name] <b>SMITE</b> thee!"))
|
||||
add_memory_in_range(user, 7, /datum/memory/witnessed_gods_wrath, protagonist = user, deuteragonist = src, antagonist = deity_name)
|
||||
user.client?.give_award(/datum/award/achievement/misc/gods_wrath, user)
|
||||
user.gib(DROP_ALL_REMAINS)
|
||||
else
|
||||
to_chat(user, span_userdanger("[deity_name] cast a curse upon thee!"))
|
||||
user.AddComponent(/datum/component/omen/bible)
|
||||
|
||||
/obj/item/book/bible/carve_out(obj/item/carving_item, mob/living/user)
|
||||
. = ..()
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
book_data = new(starting_title, starting_author, starting_content)
|
||||
|
||||
AddElement(/datum/element/falling_hazard, damage = 5, wound_bonus = 0, hardhat_safety = TRUE, crushes = FALSE, impact_sound = drop_sound)
|
||||
AddElement(/datum/element/burn_on_item_ignition)
|
||||
|
||||
/obj/item/book/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -98,9 +99,6 @@
|
||||
display_content(user)
|
||||
|
||||
/obj/item/book/attackby(obj/item/attacking_item, mob/living/user, params)
|
||||
if(burn_paper_product_attackby_check(attacking_item, user))
|
||||
return
|
||||
|
||||
if(IS_WRITING_UTENSIL(attacking_item))
|
||||
if(!user.can_perform_action(src) || !user.can_write(attacking_item))
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user