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

Modular Train/Tram System: Take 2, let's not break the working tree #1106

Merged
merged 5 commits into from May 20, 2015

Conversation

tigercat2000
Copy link
Contributor

So, What is MT/TS?

MT/TS is a modular train/tram system, which could really be more accurately named MTS. But, MT/TS sounds cooler, so I am going to go with that.

The intention of this system is to make a smooth-movement tram system using forceMove() and custom collision detection. Think spacepods or the ambulance on a larger, modular scale.

Currently, the system is very barebones, with only the basic modular-link, movement, and collision detection systems, with a very basic unpolished user-interface.

Demonstration video to come. http://youtu.be/bjyKLhJgnww
RnD one on the map: http://puu.sh/hSqtf/2dd4a2cf94.mp4

Heavily work-in-progress, this PR is only being put up as a way to keep track of said progress.

Added to map, removed the DNM tag. This will work fine enough for now.

NOW WITH 100% LESS BROKEN/CORRUPTED WORKING TREES!

This commit converts the MT/TS control system from a debugging move panel
to a on-rails system. The controlpad has been repurposed as an on/off
button.
This commit adds missing damage procs to the /obj/tram/ type, including
 - ex_act
 - emp_act
 - meteorhit
 - attack_animal
 - bullet_act

It also refactors the "don't steal this" code to make a bit more sense.
This commit adds an MT/TS to the research department, changes the names
and descriptions of the tram parts to have a little more care, and
slightly fixes the rail icon.
@SirBloodBuske
Copy link
Contributor

I've been looking for this since mars outpost <33333

@ZomgPonies ZomgPonies added Feature This PR is a new addition to the game Map Edit This PR will modify a map Sprites This PR modifies the game sprites labels May 19, 2015
ZomgPonies added a commit that referenced this pull request May 20, 2015
Modular Train/Tram System: Take 2, let's not break the working tree
@ZomgPonies ZomgPonies merged commit 5909e26 into ParadiseSS13:master May 20, 2015
@tigercat2000 tigercat2000 deleted the tram2 branch May 20, 2015 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR is a new addition to the game Map Edit This PR will modify a map Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants