Commit Graph

11595 Commits

Author SHA1 Message Date
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
3ee2430425 Made blood overlays respect blood color 2013-12-26 15:28:03 +04:00
Chinsky
e5699fde0b Readded dirtying floors. 2013-12-26 15:23:21 +04:00
Chinsky
5191cb4c6c Made drips use species blood too. 2013-12-26 14:12:28 +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
Chinsky
1c4c2d32a5 Added helper proc that adjusts brightness of given html color 2013-12-26 12:59:09 +04:00
Chinsky
e15d77eba7 Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into rainbowlood 2013-12-26 11:11:06 +04:00
Chinsky
82700e9eda Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-26 11:10: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
1311cf0300 Merge pull request #4117 from comma/bloodydoodle
Adds ability to write on floors and walls with blood.
2013-12-25 19:13:30 -08:00
Zuhayr
1888a4d956 Merge pull request #4116 from comma/showoff
Adds Show item verb
2013-12-25 19:13:21 -08:00
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
00a1462ad5 Updated turf procs for new blood system. 2013-12-26 01:56:55 +10:30
Zuhayr
3a0448c2e4 Added num2dir() proc required by /vg/ blood setup. 2013-12-26 01:56:30 +10:30
Zuhayr
8b0f778a83 Mass updates to paths for blood decals. 2013-12-26 01:56:06 +10:30
Zuhayr
80dc4f352f Added blood colour var for /vg/ blood system. 2013-12-26 01:47:07 +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
Zuhayr
4746a3ada9 Merge pull request #4120 from Miniature/master
Added leaving prints on APCs when using item on them
2013-12-25 03:52:04 -08:00
Chinsky
d166d3c992 Merge pull request #4100 from Zuhayr/dev
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Zuhayr
7dfbcdae68 Switched some if(mutation) to if(sdisability) 2013-12-25 22:14:31 +10:30
Miniature
3d6f8ee4b2 Added leaving prints on APCs when using item on them
(fix issue #4109)
2013-12-25 22:11:13 +10:30
Zuhayr
61e2a1c9b8 Merge pull request #4097 from Ccomp5950/nanoUI_pda
NANOUI PDA
2013-12-25 03:40:24 -08:00
Zuhayr
2777761cef Merge pull request #4093 from comma/guestpass
Guestpass
2013-12-25 03:39:50 -08:00
Chinsky
0c94d2892d Fixes #4071
Emote needed "me" action first, using custom_emote instead.
2013-12-25 14:44:50 +04:00
Chinsky
5071ea57ad Fix for #3583
Hostile mobs now check adjacency before applying damage.
2013-12-25 14:20:56 +04:00
Chinsky
9202fda78a Fixes #4028
Makes invisimin make mob transparent instead of icon changes.
2013-12-25 12:54:15 +04:00
Chinsky
022fdf1e19 Merge branch 'master' of https://github.com/comma/Baystation12 2013-12-25 02:47:26 +04:00
Chinsky
ab727aef11 Added link to examine shown item.
Removed grab handler because it's an abstract item.
2013-12-25 02:44:42 +04:00
Chinsky
7d95a385f2 No messages from beyond the grave pls. 2013-12-25 01:59:35 +04: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
c45f10f02b Merge branch 'dev-freeze' of https://github.com/comma/Baystation12 into dev-freeze 2013-12-25 00:36:35 +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
ee6a18d94d Adds White UI to selectable UIs 2013-12-24 23:05:41 +03: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
ddcc5386eb Adds verb similar to ID showing capability for quick showing item in active hand. 2013-12-24 09:49:23 +04:00
Mloc
0ff0004250 Merge pull request #4112 from fauxki/dev
Sprite Bug Fixes
2013-12-23 15:36:02 -08:00
DJSnapshot
782acc97cf Merge pull request #4103 from LightningIron/dev
Removed R&D lockboxes.
2013-12-23 15:25:17 -08:00
fauxki
28340d01ab #4108 - mispelling was preventing it from showing up. 2013-12-23 14:53:46 -08:00
Chinsky
bca1aa5bd4 Merge pull request #4096 from fauxki/dev
RD Closet Changes
2013-12-23 04:39:46 -08:00
Chinsky
6630a046c9 Merge pull request #4095 from DJSnapshot/dev-freeze
Misc Fixes to guns
2013-12-23 04:38:44 -08:00
Zuhayr
72727e58d5 Forgot a tilde. 2013-12-23 11:18:00 +10:30
Zuhayr
28df8b73b2 Added deactivate() for midget power. 2013-12-23 11:15:29 +10:30
Zuhayr
cc1c1e2973 Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff. 2013-12-23 10:36:36 +10:30