Commit Graph

11595 Commits

Author SHA1 Message Date
Ccomp5950
8e518cb4a9 Vending Machine PIN fix.
Removed requirement for PIN on vending machines with an easy way of adding it back in the future
or setting machines to not use it or use it depending on what we decide later on.

Someone attempted to make it where it would accept any PIN and this is just as annoying as typing in a PIN.

So...space communism, swipe your card and it spits out an item.  No PIN prompt at all.
2013-12-22 16:40:11 -06:00
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
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
Ccomp5950
fb78caf9a5 Fixes Power Grid checks killing the AI's SMES.
Added the turrent protected check to restore_power() that is already in power_failure()
2013-12-22 08:38:26 -06: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
DJSnapshot
1324be7189 Fix for guns eating empty magazines. 2013-12-21 23:15:36 -08:00
DJSnapshot
2f0b5e31f4 Fix so magazines read correctly on the Colt M1911.
Also notice for when the clip falls out.
2013-12-21 22:58: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
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
Ravensdale
95ac40a04a Re-balancing for IB, bleed rate is back to usual settings, minor nerf for
appendicitis initial bleed rate, harder to get IB.
2013-12-20 17:01:51 -08:00
fauxki
ad41957f9d Puts in a gray flatcap for the wizard.
Adds in a fancy long jacket for him too.
2013-12-20 16:59:24 -08:00
fauxki
7c695eb9ba Adds in the gentleman's suit for the gentlemanly wizard. 2013-12-20 16:58:34 -08:00
fauxki
4c4aa90b7c Adds the walking cane as a useable wizard's staff. 2013-12-20 16:56:46 -08:00
Ravensdale
13fa1709b3 IB nerf: Makes it harder to get IB, makes the initial bleed less. 2013-12-20 14:03:24 -08:00
Zuhayr
bb602139b0 Merge pull request #4074 from fauxki/dev
Centcom Update + Minor Updates
2013-12-20 10:35:57 -08:00
Zuhayr
dfeb32ce79 Merge pull request #4070 from RavingManiac/master
Crouching monkey, hidden mousetrap
2013-12-20 03:43:34 -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
fauxki
05f012b486 Added in the Longer Hair that was removed in the TG merge under the new name of Flaired hair because to many hairstyles start with long. 2013-12-20 01:28:47 -08:00
fauxki
6784e8e668 The dress is white, not orange. 2013-12-20 01:27:11 -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
RavingManiac
6f067f4b4f Removed two variables accidentally copied over from dev 2013-12-19 20:39:10 +08:00
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Zuhayr
b0b038873f Medical HUDs will now only show brainworms if the worm is controlling the host. 2013-12-19 11:00:21 +10:30
Zuhayr
44ef03e439 Prevents borers from getting through head coverage. 2013-12-19 10:38:21 +10:30
Zuhayr
11f8a5835f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-19 00:01:12 +10:30
Zuhayr
f936dbda31 Possible fix for borers teleporting through windows. 2013-12-19 00:00:28 +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
Zuhayr
c4b847e9c6 Amendment to chemistry beaker range fix. 2013-12-18 23:54:11 +10:30
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default)
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
2013-12-18 16:56:49 +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
Chinsky
5754ba204f Adds guest passes.
They act like IDs, but have limited duration (up to 30 minutes). When time is up, all access is erased from them.
Adds guest pass terminal, which issues these.
Anyone can issue them, but only to areas their ID has access to.
All issued passes are logged in terminals.
2013-12-18 11:09:12 +04:00
Zuhayr
59f35ade32 Added borer checks to handheld and advanced scanners. 2013-12-18 15:05:32 +10:30