mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-25 16:45:42 +00:00
ff6b41aa07
## About The Pull Request - Afterattack is a very simple proc now: All it does is this, and all it's used for is for having a convenient place to put effects an item does after a successful attack (IE, the attack was not blocked)  - An overwhelming majority of afterattack implementations have been moved to `interact_with_atom` or the new `ranged_interact_with_atom` I have manually tested many of the refactored procs but there was 200+ so it's kinda hard ## Why It's Good For The Game Afterattack is one of the worst parts of the attack chain, as it simultaneously serves as a way of doing random interactions NOT AT ALL related to attacks (despite the name) while ALSO serving as the defacto way to do a ranged interaction with an item This means careless coders (most of them) may throw stuff in afterattack without realizing how wide reaching it is, which causes bugs. By making two well defined, separate procs for handing adjacent vs ranged interactions, it becomes WAY WAY WAY more easy to develop for. If you want to do something when you click on something else and you're adjacent, use `interact_with_atom` If you want to do something when you click on something else and you're not adjacent, use 'ranged_interact_with_atom` This does result in some instances of boilerplate as shown here:  But I think it's acceptable, feel free to oppose if you don't I'm sure we can think of another solution ~~Additionally it makes it easier to implement swing combat. That's a bonus I guess~~ ## Changelog 🆑 Melbert refactor: Over 200 item interactions have been refactored to use a newer, easier-to-use system. Report any oddities with using items on other objects you may see (such as surgery, reagent containers like cups and spray bottles, or construction devices), especially using something at range (such as guns or chisels) refactor: Item-On-Modsuit interactions have changed slightly. While on combat mode, you will attempt to "use" the item on the suit instead of inserting it into the suit's storage. This means being on combat mode while the suit's panel is open will block you from inserting items entirely via click (but other methods such as hotkey, clicking on the storage boxes, and mousedrop will still work). refactor: The detective's scanner will now be inserted into storage items if clicked normally, and will scan the storage item if on combat mode /🆑
259 lines
10 KiB
Plaintext
259 lines
10 KiB
Plaintext
/* Clown Items
|
|
* Contains:
|
|
* Soap
|
|
* Bike Horns
|
|
* Air Horns
|
|
* Canned Laughter
|
|
*/
|
|
|
|
/*
|
|
* Soap
|
|
*/
|
|
|
|
/obj/item/soap
|
|
name = "soap"
|
|
desc = "A cheap bar of soap. Doesn't smell."
|
|
gender = PLURAL
|
|
icon = 'icons/obj/watercloset.dmi'
|
|
icon_state = "soap"
|
|
inhand_icon_state = "soap"
|
|
worn_icon_state = "soap"
|
|
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
|
|
w_class = WEIGHT_CLASS_TINY
|
|
item_flags = NOBLUDGEON
|
|
throwforce = 0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
grind_results = list(/datum/reagent/lye = 10)
|
|
var/cleanspeed = 3.5 SECONDS //slower than mop
|
|
force_string = "robust... against germs"
|
|
var/uses = 100
|
|
|
|
/obj/item/soap/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/slippery, 80)
|
|
AddComponent(/datum/component/cleaner, cleanspeed, 0.1, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean)), on_cleaned_callback=CALLBACK(src, PROC_REF(decreaseUses))) //less scaling for soapies
|
|
|
|
/obj/item/soap/examine(mob/user)
|
|
. = ..()
|
|
var/max_uses = initial(uses)
|
|
var/msg = "It looks like it just came out of the package."
|
|
if(uses != max_uses)
|
|
var/percentage_left = uses / max_uses
|
|
switch(percentage_left)
|
|
if(0 to 0.15)
|
|
msg = "There's just a tiny bit left of what it used to be, you're not sure it'll last much longer."
|
|
if(0.15 to 0.30)
|
|
msg = "It's dissolved quite a bit, but there's still some life to it."
|
|
if(0.30 to 0.50)
|
|
msg = "It's past its prime, but it's definitely still good."
|
|
if(0.50 to 0.75)
|
|
msg = "It's started to get a little smaller than it used to be, but it'll definitely still last for a while."
|
|
else
|
|
msg = "It's seen some light use, but it's still pretty fresh."
|
|
. += span_notice("[msg]")
|
|
|
|
/obj/item/soap/homemade
|
|
desc = "A homemade bar of soap. Smells of... well...."
|
|
grind_results = list(/datum/reagent/consumable/liquidgibs = 9, /datum/reagent/lye = 9)
|
|
icon_state = "soapgibs"
|
|
inhand_icon_state = "soapgibs"
|
|
worn_icon_state = "soapgibs"
|
|
cleanspeed = 3 SECONDS // faster than base soap to reward chemists for going to the effort
|
|
|
|
/obj/item/soap/nanotrasen
|
|
desc = "A heavy duty bar of Nanotrasen brand soap. Smells of plasma."
|
|
grind_results = list(/datum/reagent/toxin/plasma = 10, /datum/reagent/lye = 10)
|
|
icon_state = "soapnt"
|
|
inhand_icon_state = "soapnt"
|
|
worn_icon_state = "soapnt"
|
|
cleanspeed = 2.8 SECONDS //janitor gets this
|
|
uses = 300
|
|
|
|
/obj/item/soap/nanotrasen/cyborg
|
|
|
|
/obj/item/soap/deluxe
|
|
desc = "A deluxe Waffle Co. brand bar of soap. Smells of high-class luxury."
|
|
grind_results = list(/datum/reagent/consumable/aloejuice = 10, /datum/reagent/lye = 10)
|
|
icon_state = "soapdeluxe"
|
|
inhand_icon_state = "soapdeluxe"
|
|
worn_icon_state = "soapdeluxe"
|
|
cleanspeed = 2 SECONDS //captain gets one of these
|
|
|
|
/obj/item/soap/syndie
|
|
desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster."
|
|
grind_results = list(/datum/reagent/toxin/acid = 10, /datum/reagent/lye = 10)
|
|
icon_state = "soapsyndie"
|
|
inhand_icon_state = "soapsyndie"
|
|
worn_icon_state = "soapsyndie"
|
|
cleanspeed = 0.5 SECONDS //faster than mops so it's useful for traitors who want to clean crime scenes
|
|
|
|
/obj/item/soap/omega
|
|
name = "\improper Omega soap"
|
|
desc = "The most advanced soap known to mankind. The beginning of the end for germs."
|
|
grind_results = list(/datum/reagent/consumable/potato_juice = 9, /datum/reagent/consumable/ethanol/lizardwine = 9, /datum/reagent/monkey_powder = 9, /datum/reagent/drug/krokodil = 9, /datum/reagent/toxin/acid/nitracid = 9, /datum/reagent/baldium = 9, /datum/reagent/consumable/ethanol/hooch = 9, /datum/reagent/bluespace = 9, /datum/reagent/drug/pumpup = 9, /datum/reagent/consumable/space_cola = 9)
|
|
icon_state = "soapomega"
|
|
inhand_icon_state = "soapomega"
|
|
worn_icon_state = "soapomega"
|
|
cleanspeed = 0.3 SECONDS //Only the truest of mind soul and body get one of these
|
|
uses = 800 //In the Greek numeric system, Omega has a value of 800
|
|
|
|
/obj/item/soap/omega/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is using [src] to scrub themselves from the timeline! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
new /obj/structure/chrono_field(user.loc, user)
|
|
return MANUAL_SUICIDE
|
|
|
|
/obj/item/paper/fluff/stations/soap
|
|
name = "ancient janitorial poem"
|
|
desc = "An old paper that has passed many hands."
|
|
default_raw_text = "<B>The legend of the omega soap</B><BR><BR> Essence of <B>potato</B>. Juice, not grind.<BR><BR> A <B>lizard's</B> tail, turned into <B>wine</B>.<BR><BR> <B>powder of monkey</B>, to help the workload.<BR><BR> Some <B>Krokodil</B>, because meth would explode.<BR><BR> <B>Nitric acid</B> and <B>Baldium</B>, for organic dissolving.<BR><BR> A cup filled with <B>Hooch</B>, for sinful absolving<BR><BR> Some <B>Bluespace Dust</B>, for removal of stains.<BR><BR> A syringe full of <B>Pump-up</B>, it's security's bane.<BR><BR> Add a can of <B>Space Cola</B>, because we've been paid.<BR><BR> <B>Heat</B> as hot as you can, let the soap be your blade.<BR><BR> <B>Ten units of each reagent create a soap that could topple all others.</B>"
|
|
|
|
/obj/item/soap/suicide_act(mob/living/user)
|
|
user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!", forced="soap suicide")
|
|
user.visible_message(span_suicide("[user] lifts [src] to [user.p_their()] mouth and gnaws on it furiously, producing a thick froth! [user.p_They()]'ll never get that BB gun now!"))
|
|
var/datum/effect_system/fluid_spread/foam/foam = new
|
|
foam.set_up(1, holder = src, location = get_turf(user))
|
|
foam.start()
|
|
return TOXLOSS
|
|
|
|
/obj/item/soap/proc/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner)
|
|
. = CLEAN_ALLOWED
|
|
if(!check_allowed_items(atom_to_clean))
|
|
. |= CLEAN_NO_XP
|
|
|
|
/**
|
|
* Decrease the number of uses the bar of soap has.
|
|
*
|
|
* The higher the cleaning skill, the less likely the soap will lose a use.
|
|
* Arguments
|
|
* * source - the source of the cleaning
|
|
* * target - The atom that is being cleaned
|
|
* * user - The mob that is using the soap to clean.
|
|
*/
|
|
/obj/item/soap/proc/decreaseUses(datum/source, atom/target, mob/living/user, clean_succeeded)
|
|
if(!clean_succeeded)
|
|
return
|
|
var/skillcheck = 1
|
|
if(user?.mind)
|
|
skillcheck = user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)
|
|
if(prob(skillcheck*100)) //higher level = more uses assuming RNG is nice
|
|
uses--
|
|
if(uses <= 0)
|
|
noUses(user)
|
|
|
|
/obj/item/soap/proc/noUses(mob/user)
|
|
to_chat(user, span_warning("[src] crumbles into tiny bits!"))
|
|
qdel(src)
|
|
|
|
/obj/item/soap/nanotrasen/cyborg/noUses(mob/user)
|
|
to_chat(user, span_warning("[src] has ran out of chemicals! Head to a recharger to refill it."))
|
|
|
|
/obj/item/soap/nanotrasen/cyborg/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner)
|
|
if(uses <= 0)
|
|
return CLEAN_BLOCKED
|
|
return ..()
|
|
|
|
/obj/item/soap/storage_insert_on_interaction(datum/storage, atom/storage_holder, mob/living/user)
|
|
return !user.combat_mode // only cleans a storage item if on combat
|
|
|
|
/*
|
|
* Bike Horns
|
|
*/
|
|
|
|
/obj/item/bikehorn
|
|
name = "bike horn"
|
|
desc = "A horn off of a bicycle. Rumour has it that they're made from recycled clowns."
|
|
icon = 'icons/obj/art/horn.dmi'
|
|
icon_state = "bike_horn"
|
|
inhand_icon_state = "bike_horn"
|
|
worn_icon_state = "horn"
|
|
lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi'
|
|
throwforce = 0
|
|
hitsound = null //To prevent tap.ogg playing, as the item lacks of force
|
|
w_class = WEIGHT_CLASS_TINY
|
|
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
attack_verb_continuous = list("HONKS")
|
|
attack_verb_simple = list("HONK")
|
|
///sound file given to the squeaky component we make in Initialize() so sub-types can specify their own sound
|
|
var/sound_file = 'sound/items/bikehorn.ogg'
|
|
|
|
/obj/item/bikehorn/Initialize(mapload)
|
|
. = ..()
|
|
var/list/sound_list = list()
|
|
sound_list[sound_file] = 1
|
|
AddComponent(/datum/component/squeak, sound_list, 50, falloff_exponent = 20)
|
|
|
|
/obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
|
|
if(user != M && ishuman(user))
|
|
var/mob/living/carbon/human/H = user
|
|
if (HAS_TRAIT(H, TRAIT_CLUMSY)) //only clowns can unlock its true powers
|
|
M.add_mood_event("honk", /datum/mood_event/honk)
|
|
return ..()
|
|
|
|
/obj/item/bikehorn/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] solemnly points [src] at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
playsound(src, 'sound/items/bikehorn.ogg', 50, TRUE)
|
|
return BRUTELOSS
|
|
|
|
//air horn
|
|
/obj/item/bikehorn/airhorn
|
|
name = "air horn"
|
|
desc = "Damn son, where'd you find this?"
|
|
icon_state = "air_horn"
|
|
worn_icon_state = "horn_air"
|
|
sound_file = 'sound/items/airhorn2.ogg'
|
|
|
|
//golden bikehorn
|
|
/obj/item/bikehorn/golden
|
|
name = "golden bike horn"
|
|
desc = "Golden? Clearly, it's made with bananium! Honk!"
|
|
icon_state = "gold_horn"
|
|
inhand_icon_state = "gold_horn"
|
|
worn_icon_state = "horn_gold"
|
|
COOLDOWN_DECLARE(golden_horn_cooldown)
|
|
|
|
/obj/item/bikehorn/golden/attack()
|
|
flip_mobs()
|
|
return ..()
|
|
|
|
/obj/item/bikehorn/golden/attack_self(mob/user)
|
|
flip_mobs()
|
|
..()
|
|
|
|
/obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user)
|
|
if(!COOLDOWN_FINISHED(src, golden_horn_cooldown))
|
|
return
|
|
var/turf/T = get_turf(src)
|
|
for(M in ohearers(7, T))
|
|
if(M.can_hear())
|
|
M.emote("flip")
|
|
COOLDOWN_START(src, golden_horn_cooldown, 1 SECONDS)
|
|
|
|
/obj/item/bikehorn/rubberducky/plasticducky
|
|
name = "plastic ducky"
|
|
desc = "It's a cheap plastic knockoff of a loveable bathtime toy."
|
|
custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
|
|
|
|
/obj/item/bikehorn/rubberducky
|
|
name = "rubber ducky"
|
|
desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
|
|
icon = 'icons/obj/watercloset.dmi'
|
|
icon_state = "rubberducky"
|
|
inhand_icon_state = "rubberducky"
|
|
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
|
|
worn_icon_state = "duck"
|
|
sound_file = 'sound/effects/quack.ogg'
|
|
|
|
//canned laughter
|
|
/obj/item/reagent_containers/cup/soda_cans/canned_laughter
|
|
name = "Canned Laughter"
|
|
desc = "Just looking at this makes you want to giggle."
|
|
icon_state = "laughter"
|
|
volume = 50
|
|
list_reagents = list(/datum/reagent/consumable/laughter = 50)
|