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

Turning off speaker of leader vendor (malware) does not stop the throwing #546

Open
Shadow-Quill opened this issue Feb 7, 2020 · 4 comments
Labels
bug Something isn't working upstream Anything sourced from a branch higher than us

Comments

@Shadow-Quill
Copy link
Contributor

Brief description of the issue

Title

What you expected to happen

Throwing on all vendors to stop, and for them to shut up

What actually happened

They did not

Steps to reproduce

  1. Get malware event.
  2. Locate 'leader' vendor (first infected)
  3. Turn off speaker after at least one more is infected, watch it Yeet item at you.

Code Revision

2d8398c

@TheFurryFeline
Copy link
Contributor

Upstream issue, though it's part of the event, far as I've noticed, as an Engineering main. Turning the speaker off isn't quite the same as disabling what had been changed by the virus's presence there, which toggles the throwing function for YEETs.

@Shadow-Quill
Copy link
Contributor Author

Yaa, gotta explain this. Again.
Code says that it's supposed to kill all vendors if the origin vendor (read issue description) has its speaker kill

@Shadow-Quill
Copy link
Contributor Author

if(!vendingMachines.len || !originMachine || originMachine.shut_up)	//if every machine is infected, or if the original vending machine is missing or has it's voice switch flipped
		//VORESTATION Add - Effects when 'source' machine is destroyed/silenced
		for(var/obj/machinery/vending/saved in infectedVendingMachines)
			saved.shoot_inventory = 0
		if(originMachine)
			originMachine.speak("I am... vanquished. My people will remem...ber...meeee.")
			originMachine.visible_message("[originMachine] beeps and seems lifeless.")
		//VORESTATION Add End
		end()
		kill()
		return

@TheFurryFeline
Copy link
Contributor

TheFurryFeline commented Feb 7, 2020

Seen that for myself, yeah. Could fix it easily by making it do it for the origin vendor in addition to the others that-oh, now that's an interesting VS Edit. 👀 Also the grammar of the comments hurt my eyes. :<

@izac112 izac112 added bug Something isn't working upstream Anything sourced from a branch higher than us labels Feb 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working upstream Anything sourced from a branch higher than us
Projects
None yet
Development

No branches or pull requests

3 participants