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

Meteor Stuff #3509

Merged
merged 6 commits into from May 17, 2014
Merged

Meteor Stuff #3509

merged 6 commits into from May 17, 2014

Conversation

Cheridan
Copy link
Contributor

Removes meteorhit()

Meteor impacts call ex_act(2) instead
Meteors can penetrate things better in general
Adds new meteor types with special effects.
Meteors drop some ore, depending on the type of meteor.
Adds rare alternative meteor event.

Uses byond rotation features to make meteors spin. - Thanks Mr.Person
Refactors space dust event as a subtype of meteors. Reduces rate of space dust occurance by half. This will have a noticable effect on event rates- the event pool will be less saturated with dust, so other events will happen more often.

fixes issue #990

Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
@@ -0,0 +1,14 @@
/datum/round_event_control/meteor_wave/meaty
name = "Meateor Wave"
Copy link
Contributor

Choose a reason for hiding this comment

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

MEATeor Wave

You are the worst person

Copy link
Contributor

Choose a reason for hiding this comment

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

The proper spelling is meaty ore :(

@GunHog
Copy link
Contributor

GunHog commented Apr 23, 2014

💯 % HotelBravoLima approved 👍

Meteors spin

renames meateors
@@ -0,0 +1,14 @@
/datum/round_event_control/meteor_wave/meaty
name = "Meaty Ore Wave"
Copy link
Contributor

Choose a reason for hiding this comment

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

aaaaaaaaaauuuuuuuggggggghhhhh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

shhh it's a sekrit :^)

…o MeteorsSuck

Conflicts:
	code/game/turfs/simulated/walls.dm
@ChangelingRain
Copy link
Contributor

Is this ready to merge or is it stuck in the freeze or are there features waiting or what
I want my meteor fun, ffs

Cheridan added a commit that referenced this pull request May 17, 2014
@Cheridan Cheridan merged commit 36bb032 into tgstation:master May 17, 2014
@ghost
Copy link

ghost commented May 18, 2014

I get this compiling error:
code\modules\events\meateor_wave.dm:8:error: command_alert: undefined proc

Not sure if this is caused by me keeping the config folder unchanged while pulling changes.

@RemieRichards
Copy link
Contributor

@tr4st Don't worry, a Fix is up #3734

@ghost
Copy link

ghost commented May 18, 2014

Yeah i just saw it now. Sorry for the unneeded comment.

@RemieRichards
Copy link
Contributor

No need to apologise, Curiosity is a good thing.

@Cheridan Cheridan deleted the MeteorsSuck branch July 7, 2014 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants