Skip to content

clean up some unusual code (also broom fix) #6681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

clean up some unusual code (also broom fix) #6681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 36 additions & 38 deletions code/modules/vehicles/magicbroom.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,14 @@
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
force = 12
var/unfolded_type = /obj/vehicle/ridden/magic_broom

/obj/item/magic_broom/proc/on_examine_more(atom/source, mob/user, list/examine_list)
SIGNAL_HANDLER
examine_list += span_notice("It has the name Shion carved into the handle.")


/obj/item/magic_broom/attack_self(mob/user) //Deploys wheelchair on in-hand use
deploy_broom(user, user.loc)
/obj/item/magic_broom/examine_more(mob/user)
. = ..()
. += span_notice("It has the name \"Shion\" carved into the handle.")

/obj/item/magic_broom/proc/deploy_broom(mob/user, atom/location)
var/obj/vehicle/ridden/magic_broom/magic_broom_undeployed = new unfolded_type(location)
/obj/item/magic_broom/attack_self(mob/user)
var/obj/vehicle/ridden/magic_broom/magic_broom_undeployed = new(user.loc, src)
magic_broom_undeployed.add_fingerprint(user)
qdel(src)

/obj/vehicle/ridden/magic_broom/MouseDrop(over_object, src_location, over_location) //for picking up your floating broom i guess
. = ..()
if(over_object != usr || !Adjacent(usr) || !foldabletype)
return FALSE
if(!ishuman(usr) || !usr.can_perform_action(src))
return FALSE
if(has_buckled_mobs())
return FALSE
usr.visible_message(span_notice("[usr] picks up [src]."), span_notice("You pick up [src]."))
var/obj/vehicle/ridden/magic_broom/broom = new foldabletype(get_turf(src))
usr.put_in_hands(broom)
qdel(src)

/datum/armor/magic_broom
melee = 40
Expand All @@ -43,32 +24,35 @@
fire = 100
acid = 100

/obj/vehicle/ridden/magic_broom/proc/make_ridable()
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/magic_broom)

/obj/vehicle/ridden/magic_broom/AltClick(mob/user)
return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation

/obj/vehicle/ridden/magic_broom
name = "Magic Broom"
desc = "Wow! it really is magic!"
icon_state = "broom"
var/overlay_icon = "broom_overlay"
var/image/broom_overlay
max_integrity = 150 //MONKESTATION EDIT
max_integrity = 150
armor_type = /datum/armor/magic_broom
var/foldabletype = /obj/item/magic_broom
var/obj/item/folded_item
var/delay_multiplier = 1.5
var/overlay_icon = "broom_overlay"
var/image/broom_overlay

/obj/vehicle/ridden/magic_broom/Initialize(mapload)
/obj/vehicle/ridden/magic_broom/Initialize(mapload, obj/item/folded_item)
. = ..()
make_ridable()
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/magic_broom)
broom_overlay = image(icon, overlay_icon, ABOVE_MOB_LAYER)
ADD_TRAIT(src, TRAIT_NO_IMMOBILIZE, INNATE_TRAIT)
AddComponent(/datum/component/simple_rotation) //rotation for roleplay
if(!QDELETED(folded_item))
src.folded_item = folded_item
folded_item.forceMove(src)

/obj/vehicle/ridden/magic_broom/Destroy(force)
QDEL_NULL(broom_overlay)
folded_item = null
return ..()

/obj/vehicle/ridden/magic_broom/atom_destruction(damage_flag)
new /obj/item/stack/sheet/mineral/wood(drop_location(), 3)
QDEL_NULL(folded_item)
return ..()

/obj/vehicle/ridden/magic_broom/Move(newloc, move_dir)
Expand All @@ -88,8 +72,22 @@

/obj/vehicle/ridden/magic_broom/post_buckle_mob(mob/living/user)
. = ..()
update_appearance()
update_appearance(UPDATE_OVERLAYS)

/obj/vehicle/ridden/magic_broom/post_unbuckle_mob()
. = ..()
update_appearance()
update_appearance(UPDATE_OVERLAYS)

/obj/vehicle/ridden/magic_broom/MouseDrop(over_object, src_location, over_location) //for picking up your floating broom i guess
. = ..()
if(over_object != usr || !Adjacent(usr) || QDELETED(folded_item))
return FALSE
if(!ishuman(usr) || !usr.can_perform_action(src))
return FALSE
if(has_buckled_mobs())
return FALSE
usr.visible_message(span_notice("[usr] picks up [src]."), span_notice("You pick up [src]."))
folded_item.forceMove(drop_location())
usr.put_in_hands(folded_item)
folded_item = null
qdel(src)
29 changes: 11 additions & 18 deletions monkestation/code/modules/trading/unusual_effects/_unusual_component.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ GLOBAL_LIST_INIT(total_unusuals_per_type, list())
var/datum/component/particle_spewer/created = source_object.GetComponent(/datum/component/particle_spewer)
unusual_description = created.unusual_description

source_object.desc += span_notice("\n Unboxed by: [original_owner_ckey]")
source_object.desc += span_notice("\n Unboxed on round: [round_id]")
source_object.desc += span_notice("\n Unusual Type: [unusual_description]")
source_object.desc += span_notice("\n Series Number: [unusual_number]")

if(!length(parsed_variables))
switch(unusual_number)
if(1)
Expand All @@ -62,20 +57,22 @@ GLOBAL_LIST_INIT(total_unusuals_per_type, list())
else
source_object.name = "unusual [unusual_description] [source_object.name]"

RegisterSignal(source_object, COMSIG_ATOM_UPDATE_DESC, PROC_REF(append_unusual))
save_unusual_data()

/datum/component/unusual_handler/Destroy(force)
/datum/component/unusual_handler/RegisterWithParent()
. = ..()
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))

/datum/component/unusual_handler/UnregisterFromParent()
. = ..()
UnregisterSignal(source_object, COMSIG_ATOM_UPDATE_DESC)
UnregisterSignal(parent, COMSIG_ATOM_EXAMINE)

/datum/component/unusual_handler/proc/append_unusual(atom/source, updates)
/datum/component/unusual_handler/proc/on_examine(datum/source, mob/user, list/examine_list)
SIGNAL_HANDLER
source_object.desc = initial(source_object.desc)
source_object.desc += span_notice("\n Unboxed by: [original_owner_ckey]")
source_object.desc += span_notice("\n Unboxed on: [round_id]")
source_object.desc += span_notice("\n Unusual Type: [unusual_description]")
source_object.desc += span_notice("\n Series Number: [unusual_number]")
examine_list += span_notice(" Unboxed by: [original_owner_ckey]")
examine_list += span_notice(" Unboxed on: [round_id]")
examine_list += span_notice(" Unusual Type: [unusual_description]")
examine_list += span_notice(" Series Number: [unusual_number]")

/datum/component/unusual_handler/proc/setup_from_list(list/parsed_results)
particle_path = text2path(parsed_results["type"])
Expand All @@ -92,10 +89,6 @@ GLOBAL_LIST_INIT(total_unusuals_per_type, list())
if(!fexists(json_file))
stack_trace("We are missing the unusual JSON file, this will mess up unusual counting and unique names!")
var/list/json = json_decode(file2text(json_file))

if(!json)
return

for(var/type in json)
GLOB.total_unusuals_per_type[type] = json[type]

Expand Down
Loading