mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Qol and bugfix variety pack (#21367)
changes: - qol: "Added detailed extended examine info on mechanics to pens." - qol: "Added detailed extended examine info on mechanics to the psychiatrist/chaplain Mesmetron." - qol: "Added detailed extended examine info on mechanics to barricades." - qol: "Added some extended examine info to (hanging) flags, crayons, misc." - code_imp: "Updated dmdocs in many locations." - bugfix: "You can no longer force-feed people crayons. However, you can still offer a bite of crayon for them to accept or refuse, for tradition's sake." - bugfix: "Reading the contents of a noticeboard now makes you actually face the noticeboard."
This commit is contained in:
@@ -69,6 +69,10 @@
|
||||
colourName = "rainbow"
|
||||
reagents_to_add = list(/singleton/reagent/crayon_dust/brown = 20)
|
||||
|
||||
/obj/item/crayon/rainbow/mechanics_hints(mob/user, distance, is_adjacent)
|
||||
. += ..()
|
||||
. += "Use this on yourself to change the current primary and shade colors."
|
||||
|
||||
/obj/item/pen/crayon/rainbow/attack_self(mob/living/user as mob)
|
||||
colour = input(user, "Please select the main colour.", "Crayon colour") as color
|
||||
shadeColour = input(user, "Please select the shade colour.", "Crayon colour") as color
|
||||
@@ -80,6 +84,10 @@
|
||||
shadeColour = "#886422"
|
||||
desc = "A crayon that is integrated into a user's finger. It can synthesize a multitude of colors."
|
||||
|
||||
/obj/item/crayon/augment/mechanics_hints(mob/user, distance, is_adjacent)
|
||||
. += ..()
|
||||
. += "Use this on yourself to change the current primary and shade colors."
|
||||
|
||||
/obj/item/pen/crayon/augment/Initialize()
|
||||
. = ..()
|
||||
name = "integrated crayon"
|
||||
@@ -141,8 +149,22 @@
|
||||
if(ishuman(target_mob))
|
||||
var/mob/living/carbon/human/H = target_mob
|
||||
if(H.check_has_mouth())
|
||||
target_mob.visible_message(SPAN_NOTICE("[target_mob] takes a bite of their crayon and swallows it."),
|
||||
SPAN_NOTICE("You take a bite of your crayon and swallow it."))
|
||||
// The end of an era: no more force-feeding people crayons.
|
||||
if(user != target_mob)
|
||||
var/crayon_eater_response = alert(target_mob, "[user] is trying to feed you a crayon. How hungry are you?", "Hunger", "Very hungry!", "Not that hungry.")
|
||||
// The ungrateful bastard doesn't want to eat any crayon.
|
||||
if(crayon_eater_response == "Not that hungry.")
|
||||
target_mob.visible_message(SPAN_NOTICE("[target_mob] pushes away the crayon [user] held out for them to eat."),
|
||||
SPAN_NOTICE("[target_mob] doesn't want seem to eat any crayon right now."))
|
||||
return TRUE
|
||||
// Yum yum! This message is handled separately to make it Very Clear to observers that someone is hand-feeding someone else a crayon.
|
||||
else
|
||||
target_mob.visible_message(SPAN_NOTICE("[target_mob] takes a bite of the crayon held out by [user] and swallows it."),
|
||||
SPAN_NOTICE("You take a bite of crayon and swallow it."))
|
||||
|
||||
else
|
||||
target_mob.visible_message(SPAN_NOTICE("[target_mob] takes a bite of crayon and swallows it."),
|
||||
SPAN_NOTICE("You take a bite of crayon and swallow it."))
|
||||
|
||||
target_mob.adjustNutritionLoss(-1)
|
||||
reagents.trans_to_mob(target_mob, 2, CHEM_INGEST)
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
/obj/item/storage/box/syndie_kit/chameleon
|
||||
name = "chameleon kit"
|
||||
desc = "Comes with all the clothes you need to impersonate most people. Acting lessons sold seperately."
|
||||
desc = "Comes with all the clothes you need to impersonate most people. Acting lessons sold seperately."
|
||||
worn_overlay = "syndiesuit"
|
||||
starts_with = list(
|
||||
/obj/item/clothing/under/chameleon = 1,
|
||||
@@ -77,7 +77,7 @@
|
||||
|
||||
/obj/item/storage/box/syndie_kit/clerical
|
||||
name = "clerical kit"
|
||||
desc = "Comes with all you need to fake paperwork. Assumes you have passed basic writing lessons."
|
||||
desc = "Comes with all you need to fake paperwork or write with invisible ink. Assumes you have passed basic writing lessons."
|
||||
worn_overlay = "pen"
|
||||
starts_with = list(
|
||||
/obj/item/stamp/chameleon = 1,
|
||||
|
||||
Reference in New Issue
Block a user