Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
Mloc-Argent
c337e5e5f3
More elegant solution to dirt getting in the way.
...
Who needs to click dirt anyway?
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 21:34:15 +00:00
Zuhayr
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +10:30
Ccomp5950
c8beb39944
Dirt Fixes. Pass ALL the attack_by's to the floor.
2014-01-05 19:17:26 -06:00
Zuhayr
2c492d8289
Using DNA2 files from master.
2014-01-03 11:19:40 +10:30
Chinsky
2cf4a9279c
Merge pull request #4157 from Ccomp5950/cleanbot_fix
...
Bugfix: Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
645710cb0b
Bugfix: Actually implement cleanbot targeting.
...
Cleanbots won't attempt to clean up the same mess.
Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.
It was creating a blank list and then checking that list to see if anything else had
that mess targeted. Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
25f7db1949
Fix for unremovable dirty tiles.
2013-12-31 11:32:36 +10:30
Zuhayr
df6bd5d6c8
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
2013-12-30 21:48:34 +10:30
Zuhayr
154717aef6
Actually stopped gibs from being shaded without making their footprints pale.
2013-12-29 04:06:17 +10:30
Zuhayr
bf820a99b6
Fixed robot gib display issue, updated single path on map to new path.
2013-12-29 03:07:20 +10:30
Zuhayr
5313851da9
Converted robots over to current blood system/paths, updated various files to work with update.
2013-12-29 02:48:20 +10:30
Zuhayr
5d902525cf
Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour.
2013-12-29 02:47:46 +10:30
Zuhayr
73a5efec2a
Fixed a gib display issue with robots.
2013-12-29 02:32:10 +10:30
Zuhayr
ca47918e4b
Actually fixed the blood writing runtime this time.
2013-12-29 01:12:47 +10:30
Zuhayr
a17b37ec95
Runtime fix for blood lettering decal.
2013-12-29 00:12:53 +10:30
Zuhayr
01dd4373d0
Minor bugfix with blood painting code.
2013-12-29 00:11:21 +10:30
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Zuhayr
661593718f
Using dev-freeze map.
2013-12-27 10:42:13 +10:30
Chinsky
d920a4651f
Fixed rainblowd
2013-12-26 18:16:29 +04:00
Chinsky
a097c235ed
Made tracks use colors instead of icon procs too.
2013-12-26 18:12:01 +04:00
Chinsky
38a8b58ec8
Replaced weird ass space indenetation with tabs in tracks.dm
2013-12-26 16:27:09 +04:00
Chinsky
ff89532402
Sets right color for shoes overlay when stepping in blood.
2013-12-26 16:21:17 +04:00
Chinsky
57178dd251
Derp, forgot to change back from debug icon file
2013-12-26 15:36:25 +04:00
Chinsky
a4e2756134
Made blood coloring use color var instead of icon operations.
...
Updated icons to match (they need to be white instead of black to work)
Updated some colors to look fine on them.
2013-12-26 14:07:18 +04:00
Chinsky
9d9d6de78d
Stopped robot chunks from drying up like meat ones. It's weird, and makes them pitch black.
2013-12-26 13:27:36 +04:00
Zuhayr
e89fe94af8
Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.
2013-12-26 14:48:05 +10:30
Zuhayr
d97180239b
Using chinsky's blood file.
2013-12-26 13:46:12 +10:30
Zuhayr
d9a0f496c0
Removed debug strings/values.
2013-12-26 10:35:45 +10:30
Zuhayr
5b6ec6cd12
Added arbitrarily coloured blood decals.
2013-12-26 10:29:42 +10:30
Zuhayr
6b2bfbc38d
Species-based blood colour support code.
2013-12-26 03:21:46 +10:30
Zuhayr
8b0f778a83
Mass updates to paths for blood decals.
2013-12-26 01:56:06 +10:30
Zuhayr
2e0ff4cd87
Converting existing objects over to /vg/station blood setup.
2013-12-26 01:46:39 +10:30
Chinsky
716a901858
Made ash dirty floors
2013-12-25 15:10:10 +03:00
Chinsky
0b670f611d
Makes ash disappear on attack_hand to solve issue where paper burned inside containers would create immovable pile of ash.
...
I could swear that's how ash behaved at some point, but then again, I am drunk
2013-12-25 00:58:20 +04:00
Chinsky
ac1c24f35c
Adds ability to write on floors and walls with blood.
...
Codersprites for now.
2013-12-25 00:11:50 +04:00
Chinsky
e3e569593d
Fixed dried blood showin up as 'dried the blood'
2013-12-24 18:47:06 +03:00
Chinsky
4cb94fbf50
Small pefomance boost for drying blood.
...
Now using colors instead of icon procs.
2013-12-24 09:33:00 +03:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
Chinsky
b96f9ef650
Merge pull request #3744 from Baystation12/dev-freeze
...
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Mloc-Argent
ebf2ba2d4a
Fixes.
...
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:35:26 +01:00
Zuhayr
c7942b7eaf
Merge pull request #3651 from SkyMarshal/airfixes
...
ZAS update, needs testing.
2013-09-07 05:46:04 -07:00
SkyMarshal
073f462e1b
WIP ZAS rework.
2013-09-03 20:25:02 -07:00
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Erthilo
547c1e670d
Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.
2013-08-31 20:12:19 +01:00
Mloc-Argent
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
LordBraindead
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
comma
1095bd1978
Merge branch 'bleeding-edge-freeze' into viro
2013-07-09 12:49:23 +04:00
