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

Fixes #7830, noclip roaches #12954

Merged
merged 1 commit into from Jan 11, 2017
Merged

Fixes #7830, noclip roaches #12954

merged 1 commit into from Jan 11, 2017

Conversation

ghost
Copy link

@ghost ghost commented Dec 20, 2016

No description provided.

@@ -392,10 +392,12 @@

/datum/disease2/effect/spawn/activate(var/mob/living/carbon/mob,var/multiplier)
//var/mob/living/carbon/human/H = mob
var/placemob = locate(mob.x + pick(1,-1), mob.y, mob.z)
var/turf/T = locate(mob.x + pick(1,-1), mob.y, mob.z)
Copy link
Contributor

@9600bauds 9600bauds Dec 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kind of a weird pattern, the roach always goes to your east or to your west, it'd make more sense if it went in front of you or just always in your tile. But hey this is just a bugfix.

@@ -392,10 +392,12 @@

/datum/disease2/effect/spawn/activate(var/mob/living/carbon/mob,var/multiplier)
//var/mob/living/carbon/human/H = mob
var/placemob = locate(mob.x + pick(1,-1), mob.y, mob.z)
var/turf/T = locate(mob.x + pick(1,-1), mob.y, mob.z)
if(T.density) //To prevent spiders inside walls.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use regular movement procs such as can pass.

Copy link
Member

@Exxion Exxion Dec 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did
Did you just say can_pass()?
Get with the times, gramps

Actually now that I think about it, I'm pretty sure it was CanPass()
But either way we use Cross() now

@9600bauds
Copy link
Contributor

9600bauds commented Dec 20, 2016

Should I just go ahead and make it spawn in a random tile around you or keep the weird east-west thing?

Hell, or even just make it spawn in your tile, you're not really projectile vomiting spiders here are you

@Probe1 Probe1 added the Bug / Fix This is either a bug or a fix for a bug. label Dec 20, 2016
@vgstation-coders vgstation-coders locked and limited conversation to collaborators Dec 22, 2016
@PJB3005
Copy link
Contributor

PJB3005 commented Dec 22, 2016

@Imagebard fuck off.

@vgstation-coders vgstation-coders unlocked this conversation Dec 22, 2016
@9600bauds
Copy link
Contributor

2016-12-28_16-06-32
honestly I think this is better than the mysterious side-projectile-vomiting that was going on before

@ComicIronic
Copy link
Contributor

Get a better editor, Celt.

@9600bauds
Copy link
Contributor

Get a better editor

PJB's gonna FREAK!

@PJB3005
Copy link
Contributor

PJB3005 commented Dec 30, 2016

What @ComicIronic that it removes trailing whitespace from lines?

That's a feature.

Atom masterrace.

@Exxion
Copy link
Member

Exxion commented Dec 30, 2016

Atom in general is disgusting, but that's an OK feature

@ComicIronic
Copy link
Contributor

atom

Can you give me the anchor link to your code

@PJB3005
Copy link
Contributor

PJB3005 commented Dec 30, 2016

@9600bauds
Copy link
Contributor

aaaaaaaaaaaaaaaaaaahhhhhhhhhhhhh the conflicts

@ComicIronic
Copy link
Contributor

Chromium sure does look pretty.

@gbasood gbasood added the Conflicts Conflicts with something. label Jan 6, 2017
@9600bauds 9600bauds dismissed PJB3005’s stale review January 9, 2017 23:16

done & conflicted & done & conflicted & then done

@9600bauds 9600bauds removed the Conflicts Conflicts with something. label Jan 9, 2017
@9600bauds
Copy link
Contributor

dreamseeker_2017-01-11_16-57-22
a poor innocent atmos tech git got today because this is taking 2 weeks to get merged

@Probe1 Probe1 merged commit b1ed602 into vgstation-coders:Bleeding-Edge Jan 11, 2017
ihadtoregisterforthis pushed a commit to ihadtoregisterforthis/fork4 that referenced this pull request Jul 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug / Fix This is either a bug or a fix for a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants