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

Dev-freeze fixes #4462

Merged
merged 5 commits into from
Feb 21, 2014
Merged

Dev-freeze fixes #4462

merged 5 commits into from
Feb 21, 2014

Conversation

ElArGee
Copy link
Contributor

@ElArGee ElArGee commented Feb 20, 2014

Fixes #4455
Fixes a few other map bugs (details in commit: 8fd0378)
Fixes and cleanup for my pipe standardization PR: #4385 (details in commit: f451fd4)

- updated update_icon() for pipes and manifolds to change the color instead of the sprite
- updated subtypes to use global defines for colors instead of hard coded html refs
- added an alpha tweak to hidden pipes for the sake of mapping (DM doesn't render semi-transparent icons correctly, but it does handle var/alpha tweaks) - this is overridden when the pipe is spawned in the game world with New()
(Thinking about it, we could potentially do away with the transparent pipe sprites by just using the alpha variable. May do this later.)
- fixed pipe painter
- unwrenched pipes now inherit their source pipe color, and also inherit it when reattached to a pipe network again
- Fixed lighting issues in dorms (added APC to bedroom area, also gave cryo storage and dorm bedrooms their own area subtypes so light switches don't conflict anymore)
- Fixed 0-2 cable "pixel_y = 1" offset (it was making a 1 pixel gap between south-to-end cables on the map)
- Replaced research outpost piping with new subtypes
- Fixed a broken air supply pipe running to the research outpost auxiliary storage area
- Replaced a few plating turfs in space with airless platings
@ElArGee
Copy link
Contributor Author

ElArGee commented Feb 20, 2014

Thanks, wasn't quite sure how that worked. I'll commit it out.

Is there any documentation on afterattack()? I couldn't find much on how it works.

Oops. Thanks Segrain.
@Segrain
Copy link
Contributor

Segrain commented Feb 20, 2014

It's here. Basically, attackby() is called when thing clicks on thing, and if it doesn't return non-zero value, afterattack() is also called.

- Added an extended capacity emergency tank to the CE's locker
- Fixed a few closets not adding items to their contents at round start (wardrobes have the same issue, but I've already fixed them on master)
@ElArGee
Copy link
Contributor Author

ElArGee commented Feb 20, 2014

Thanks Segrain.

Also, added a couple more minor fixes based on forum feedback.

Ccomp5950 added a commit that referenced this pull request Feb 21, 2014
@Ccomp5950 Ccomp5950 merged commit e0f26b1 into Baystation12:dev-freeze Feb 21, 2014
@ElArGee ElArGee deleted the freezefix branch February 21, 2014 00:48
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

3 participants