Skip to content
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.

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

Runtime fix and code maintenance for vendors #5115

Merged
merged 2 commits into from
Dec 4, 2023

Conversation

Birdtalon
Copy link
Contributor

@Birdtalon Birdtalon commented Dec 3, 2023

About the pull request

#5066 introduced a runtime in certain vendors when attacking them with anything.
Also removes duplicate attackby() definition.

[2023-12-03 16:04:24.708] runtime error: undefined variable /obj/item/storage/belt/marine/var/token_type
 - proc name: redeem token (/obj/structure/machinery/cm_vending/proc/redeem_token)
 -   source file: code/game/machinery/vending/cm_vending.dm,453
 -   usr: William Henderson (/mob/living/carbon/human)
 -   src: the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep)
 -   usr.loc: the floor (186,73,3) (/turf/open/floor/almayer)
 -   src.loc: the floor (185,73,3) (/turf/open/floor/almayer)
 -   call stack:
 - the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep): redeem token(the M276 pattern ammo load rig (/obj/item/storage/belt/marine), William Henderson (/mob/living/carbon/human))
 - the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep): attackby(the M276 pattern ammo load rig (/obj/item/storage/belt/marine), William Henderson (/mob/living/carbon/human), /list (/list))
 - the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep): attackby(the M276 pattern ammo load rig (/obj/item/storage/belt/marine), William Henderson (/mob/living/carbon/human), /list (/list))
 - William Henderson (/mob/living/carbon/human): click adjacent(the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep), the M276 pattern ammo load rig (/obj/item/storage/belt/marine), /list (/list))
 - William Henderson (/mob/living/carbon/human): do click(the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep), the floor (185,73,3) (/turf/open/floor/almayer), "icon-x=1;icon-y=22;left=1;butt...")
 - ***** (/client): Click(the ColMarTech Surplus Uniform... (/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep), the floor (185,73,3) (/turf/open/floor/almayer), "mapwindow.map", "icon-x=1;icon-y=22;left=1;butt...")

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
fix: Fixes a runtime in vendors
/🆑

@Birdtalon Birdtalon added Fix Fix one bug, make ten more Code Improvement Make the code longer labels Dec 3, 2023
@fira fira mentioned this pull request Dec 4, 2023
@realforest2001 realforest2001 added this pull request to the merge queue Dec 4, 2023
@realforest2001
Copy link
Member

I'm going to be naughty and merge a bit early as it's a bug I introduced & is flooding runtime logs.

Merged via the queue into cmss13-devs:master with commit faefea7 Dec 4, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 4, 2023
@Birdtalon Birdtalon deleted the spectokensfix branch December 21, 2023 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants