Commit Graph

3182 Commits

Author SHA1 Message Date
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
6888651da6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-28 23:14:43 +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
6f186d6bac Possible fix for href exploit in uplinks, unable to test locally. 2013-12-27 18:12:46 +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
3ee2430425 Made blood overlays respect blood color 2013-12-26 15:28:03 +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
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
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
d166d3c992 Merge pull request #4100 from Zuhayr/dev
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Zuhayr
61e2a1c9b8 Merge pull request #4097 from Ccomp5950/nanoUI_pda
NANOUI PDA
2013-12-25 03:40:24 -08: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
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
ddcc5386eb Adds verb similar to ID showing capability for quick showing item in active hand. 2013-12-24 09:49:23 +04:00
Chinsky
bca1aa5bd4 Merge pull request #4096 from fauxki/dev
RD Closet Changes
2013-12-23 04:39:46 -08:00
Chinsky
94e94dfa5d Adds gun cabinets - special snowflake secure closets.
Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.
2013-12-22 23:10:22 +04:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30
Mloc
cd9c933111 Merge pull request #4088 from comma/signs
Adds signs pointing where department is.
2013-12-22 05:32:07 -08:00
Zuhayr
197d4993cf Merge pull request #4087 from comma/nostalgy
Revisiting my first commits.
2013-12-22 05:28:35 -08:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Ccomp5950
ec7921909f NANOUI PDA
Creates NanoUI for the PDA and Syndicate Uplink.

New features:
	Crew manifest now sorted with department heads at the top.
	Can select individual conversations and delete individual conversations among PDA's
	Powernet Monitor much more simple now and easier to read.
	Janitorial supplies locator now includes Janicart.
	Items will actually refresh if you click "Refresh"

Some other changes:
	Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
	With the conversation change I had to change how tnote (the variable that holds PDA messages works.
		Setup the message server to use the new methods.
	Removed procs that will no longer be used (UI generation procs from old UI methods)
	Commented everything the best I can.
	Created HORRIBLE, TERRIBLE lists.  But it's pretty much required because that's how nanoUI rolls.
	Created a variable on the uplink called NanoUI items, this list is created upon creation of the
		uplink.

	I included the functionality for Mimes and Clowns for our downstream servers that have those.
2013-12-22 06:18:39 -06:00
fauxki
a6aa087e00 Places RD Alt uniform, RD dress, and leather shoes in RD closet. 2013-12-22 04:17:46 -08:00
Zuhayr
bb602139b0 Merge pull request #4074 from fauxki/dev
Centcom Update + Minor Updates
2013-12-20 10:35:57 -08:00
fauxki
247cae41a1 Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it. 2013-12-20 01:29:13 -08:00
Asanadas
1ae17bb724 Merge pull request #4073 from Zuhayr/borertweaks
Borer tweaks/additions. Borers for the Borer God.
2013-12-19 18:17:44 -08:00
Zuhayr
11f8a5835f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-19 00:01:12 +10:30
Mloc
19d33bc2ee Merge pull request #4065 from SkyMarshal/patch-4
Ghosts can see PDA messages.
2013-12-18 05:26:41 -08:00
Chinsky
582bebc0d1 Adds signs pointing where department is.
Change dir var to change direction of arrow.
2013-12-18 12:34:53 +04:00
Chinsky
65fa11d496 Revisiting my first commits.
Updated ashtray to actually accept cig butts and crush lit cigs properly.
Applied random transform to cig butts, and made fingerprints from original cig carry over.
2013-12-18 12:02:20 +04:00
Zuhayr
59f35ade32 Added borer checks to handheld and advanced scanners. 2013-12-18 15:05:32 +10:30
SkyMarshal
4e4ee34ec8 Herp derp 2013-12-17 20:24:00 -07:00
Zuhayr
924a7af50a Fixes #4034 2013-12-18 11:17:17 +10:30