* commit for branch swap
* branch swap again
* BLEED
* trying to clear up compile errors
* i killed everything when i tested this...
* restorealltheblood
* I REMOVED A THING
* well some progress
* stop bleeding
* got to swap branches again.
* grr
* damn bloodcolors
* Squash everything
* color....colourrrrrrr
* color....colourrrrrrr
* well now that updated the branch...
* Changes
* Some tweaks..before i upload something major
* COLOR NOT COLOUR...COLOR
YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD
* Foot print shit..
blood coloring is going to be PAIN
* trying to handle some colors..maybe.
* blood colorsing sucks..di i mention this?
* commenting cod malfunctions.
* Changes
* lets try this
* Its too late at night.
* blargh
* woops
* almost works...
* progress..
* Branch swap
* figured out the overlay issue....
* BRANCH SWAP
* BLARGH
* fixed merged conflicts..expect something to be horribly wrong.
* bunch of changes
* Major Fixes
- Moved blood_state and bloodiness var definitions to
/obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
order to make blood color work properly.
- These were not used by any other decal, so it was pointless.
- Tweaked human/add_blood so that hand_blood_color uses the correct
value now.
- Corrected gibs having the wrong basecolor.
- Tracks of different blood colors will no longer combine weirdly, and
will instead form seperate overlays.
- This also fixes all of the issues with tracks in general and not
updating correctly.
- Fixed transfering blood in add_fingerprint; the old detective code
didn't use the new format for add_blood().
- Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
own trails. Sprites should probably be brightened later.
- Fixed mobs occasionally randomly having their blood_DNA list reset.
* may have accidently removed shit.
* Mrowl
* stiff
water is not bleeding
lowered trail making threshold
* tweaks then conflcits
* weee
* indent
* some tweaks
* somefox tweaks.
* derp
* why won't they bleed!?
* BLEED DAMMIT
* Flattist comments and removes simple animale blood volume
Cause i cannot get it to work right.
* PRAISE FLATTIST
* Simple animals have a blood volume now
Bug with trail fixed.
* changes
* thanksmrowlmrowl
* exotice blood trails
* makesure is an exotic bleeder has a bleed rate first...
* FoxBoxTweakSox
* BoxVoxSoXFox
* ONE MORE THING
* animalsbleedreds
* Buh? BUGH!
* thisismescreaming
* removing note needed thing
* Color changes but the rabbit hole continues.
* This is not pretty....
* wot
* IT WORKS DAMMIT
* colors.
* germaphobic commit..
* we have to use the old system
* nothing to see here
* doubleprocarady
* try to fix mulebots
* mulebot fixed
* DONE
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.
To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
This commit refactors light_color definitions for most machines and
consoles that use light_color's. Instead of having the same color repeated
over and over again, there are #defines for most of the common ones.
Some machines and other places may not use lighting defs- this is
intentional. The defines as they are, are relatively clean, and machinery
was where the bulk of repeated light definitions were. Other, special
colors, can just be defined in the same file that they are used once in.
- Added colored lights to all listed computers
- Should be fullly functional
- Uses the code Pomf used for Telecomms Computer testing
Conflicts:
code/game/machinery/computer/arcade.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/station_alert.dm
code/game/machinery/telecomms/traffic_control.dm
-Made computers use idle_power_usage and active_power_usage that it used from the MC.
I'm sure something is likely to break because I removed a lot of snowflake code. I tried to test all the computers with what I can but if you find something odd then please tell me.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5369 316c924e-a436-60f5-8080-3fe189b3f50e
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
-Atmos delay is now based on active players, to help fight lag for massive player rounds.
-Changed some for(blah in world) loops to use the correct lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
Updated operating tables to search for adjacent computers, rather than using an ID.
Switched back to the old bodybag sprites.
Slightly updated the Oddy destroyed sprites, and updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3547 316c924e-a436-60f5-8080-3fe189b3f50e
Moved a few of the computers into their own files.
Security records now shows rank on the browse screen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2909 316c924e-a436-60f5-8080-3fe189b3f50e
