Commit Graph

11470 Commits

Author SHA1 Message Date
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
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
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
9202fda78a Fixes #4028
Makes invisimin make mob transparent instead of icon changes.
2013-12-25 12:54:15 +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
ac1c24f35c Adds ability to write on floors and walls with blood.
Codersprites for now.
2013-12-25 00:11:50 +04: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
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
LightningIron
cb3e39c476 Removed R&D lockboxes. 2013-12-22 13:29:28 -06:00
Chinsky
4c4ee3eae5 Counting on machine controller to set uid was foolish of me. 2013-12-22 23:14:23 +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
Ccomp5950
befb623417 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanoUI_pda 2013-12-22 07:01:15 -06:00
Zuhayr
d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
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
fauxki
a2f6d7919a Removes RD dress from here, it's to be moved as a subsection of the RD unifrom. 2013-12-22 04:16:56 -08:00
fauxki
08758cfd6a Adds in new alt RD uniform, as well as moves the RD Dress from the dress section to a subsection of RD uniform. 2013-12-22 04:16:24 -08:00
Chinsky
a498de8356 Fixes #4075
Cannot turn around while unconscious or dead now.
2013-12-22 08:49:42 +04:00
Chinsky
19c83de6af Applying Minifix to Yinaderp
ID of resulting chemical was not set, so reagents just disappeared
2013-12-22 07:55:03 +04:00
Chinsky
68b51d3188 Guest pass does not require to be processed anymore.
Also agent IDs cannot copy access off them now (I think it would make them too powerful)
2013-12-22 07:53:17 +04:00
Chinsky
3604986aff Merge pull request #4081 from fauxki/dev
Gentleman's Outfit for wizard.
2013-12-21 19:45:38 -08:00
alex-gh
a48100da74 Reattaching a mindless head no longer results in a runtime error 2013-12-21 22:50:13 +01:00
Zuhayr
b6fed55fcd Merge pull request #4086 from Ravensdale/player_age
Player age restriction tweak
2013-12-21 08:06:26 -08:00
Ravensdale
9d9c797135 changes pushed to master branch instead of dev 2013-12-21 07:31:43 -08:00