Commit Graph

11210 Commits

Author SHA1 Message Date
fauxki
a9de4f00f2 * Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck. 2013-10-05 08:25:03 -07:00
SkyMarshal
cffa100caa Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:32:02 -07:00
SkyMarshal
eeb25f7b89 Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:29:25 -07:00
Chinsky
f5d17f89f2 Changes to airlock opening:
-Only people with engineering access can open them by hand.
-Crowbarring them open/close now takes some time (~3 sec)
2013-10-05 10:12:46 +04:00
Chinsky
1ff9a20f68 Standartized definitions. 2013-10-05 09:16:56 +04:00
Chinsky
1f53ed0591 Merge pull request #3722 from Baystation12/master
Master -> Dev
2013-09-30 16:01:20 -07:00
Chinsky
82bd221aa3 Fix for #3667 2013-10-01 01:15:02 +04:00
Chinsky
62ecc88a1f Fix for #3628
Stops dead people from sending PDA messages.
2013-10-01 00:30:12 +04:00
Chinsky
86715a423b Partial fix for #3697
Would not carry over gutter and such, only species-specific languages.
Full fix would require moving languages out of mob into mind, and I am really lazy, this will cover 98% cases.
2013-10-01 00:16:29 +04:00
Chinsky
8eb2f7db67 Fix for #3686
Thign now drops all stuff before turning into a tree.
2013-09-30 23:12:50 +04:00
Chinsky
2ad7bc8108 Fix for #3677
Flags were set backwards AND on wrong var
2013-09-30 22:13:26 +04:00
Chinsky
b80006da9c Fix for #3713, dev part 2013-09-30 21:12:22 +04:00
Chinsky
57497f9b12 Renamed file so defines go before they are used.
<3 DM FOR IGNORING MANUAL DME EDITS LIKE THAT
2013-09-30 21:06:42 +04:00
Chinsky
b87669f592 Fix foe #3713
Megaphones will have to be fixed separately, since they are on dev branch.
2013-09-30 20:49:44 +04:00
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix
Auto-transfer voting Redux: Episode 2.
2013-09-30 07:53:49 -07:00
Nanai
f78800a248 Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad. 2013-09-30 02:02:49 -04:00
DJSnapshot
f956971fdf Small change to code. (Was locking up game ticker.) 2013-09-29 22:13:58 -07:00
ZekeSulastin
01201ce473 Made modules/detectivework and economy lowercase 2013-09-30 00:22:32 -04:00
ZekeSulastin
1d21cc7e55 Missed a couple 'color to item_color' in stamps.dm 2013-09-29 23:57:08 -04:00
DJSnapshot
1a48a2b6b0 Auto-transfer voting! 2013-09-29 12:05:10 -07:00
DJSnapshot
dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -07:00
DJSnapshot
6d3caf78a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bugfix 2013-09-26 22:34:51 -07:00
DJSnapshot
8a83008e62 bugfix for custom AI sprites. 2013-09-26 22:32:23 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01:00
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Chinsky
4b17be8215 Merge pull request #3693 from caelaislinn/accounts_updates
Economy/Accounts updates
2013-09-24 10:15:10 -07:00
DJSnapshot
a11f1d4bdb Hotfix for infinite mangling of gloves. 2013-09-22 13:10:14 -07:00
Kilakk
b5095646e2 Mining shuttle console now tells you if the shuttle is moving or not 2013-09-22 15:48:39 -04:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500.
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-22 12:39:48 +01:00
Mark Aherne (Faerdan)
a2438f3e80 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-20 23:13:07 +01:00
Mark Aherne (Faerdan)
f9906ef76e Styling improvements for Chem Dispenser and DNA Modifier Nano UIs.
Injector buttons are now disabled when the injector system is not ready.
2013-09-20 23:08:04 +01:00
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-09-20 13:35:49 +10:00
Mark Aherne (Faerdan)
1fe407f769 Updates to Nano DNA Modifier UI:
* Fixed DNA block selection.
* Added change label button.
* Added Block Injector button.
2013-09-20 01:02:08 +01:00
Segrain
a24fd41829 Fixes for typos. 2013-09-19 08:37:29 +03:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03:00
Segrain
9eee328d34 Verb categories. 2013-09-19 08:30:05 +03:00
Segrain
ed4389c676 Fix for invisible carpets. 2013-09-19 08:27:34 +03:00
Mark Aherne (Faerdan)
21485aa1fd Styling fixes for DNA Modifier Nano UI.
Fixed wipe and eject disk buttons.
2013-09-19 02:12:57 +01:00
Mark Aherne (Faerdan)
e0924bf4ab Multiple minor updates to Nano.
Created new DNA Modifier Nano UI.

Refactored the DNA Modifier code.
2013-09-19 01:39:59 +01:00
Kilakk
9bd3f2997c Added in an awesome fax machine sprite by Cajoes 2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75 World loop removed successfully 2013-09-16 17:12:36 -04:00
Kilakk
6c4644664e Absolute paths for faxmachine procs 2013-09-16 17:09:36 -04:00
Segrain
a80efba1fb Fix for #3683. 2013-09-15 19:39:53 +03:00
Segrain
c055f722dd Localised implant detection. 2013-09-14 23:50:31 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
SkyMarshal
1f634873ea Merge pull request #20 from SkyMarshal/patch-3
Fixes EFTPOS units failing to connect to account DB.
2013-09-13 21:14:31 -07:00
SkyMarshal
7d81b02dbe Fixes EFTPOS units failing to connect to account DB. 2013-09-13 21:13:43 -07:00
SkyMarshal
7b1974e4b5 Prevents the accounts database from automatically being removed from machines. 2013-09-13 21:12:49 -07:00
Segrain
9eaf5cf273 Smallfix. 2013-09-13 19:46:45 +03:00
Segrain
91068e31c8 Falling fix. 2013-09-13 19:45:22 +03:00