Commit Graph

17479 Commits

Author SHA1 Message Date
Amunak
6bf59253fd Fixes wrong shield design path 2014-12-14 05:16:49 +01:00
Zuhayr
29a3d34ff0 Fixes (at least some) of the recursive power-drain crash issues. 2014-12-14 14:44:53 +10:30
Amunak
b84cc64027 Removes duplicate shield research definitions.
They were moved to the common designs file by a previous commit.
2014-12-14 05:05:55 +01:00
Amunak
b7e7d08599 Fixes destructive analyzer name. Removed oldcode. 2014-12-14 05:05:09 +01:00
Amunak
67c719d9d6 Updated medical records console description. 2014-12-14 05:03:15 +01:00
Amunak
158573f066 Corrects names of computers, code formatting, updated computer descriptions.
Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
2014-12-14 05:00:38 +01:00
Amunak
429a898e72 Fixes a bug that made bubble shield gen unconstructable 2014-12-14 04:56:23 +01:00
Zuhayr
920ede6767 Merge pull request #7458 from mwerezak/chem-colours
Fixes colour mix up
2014-12-14 13:09:12 +10:30
Zuhayr
70abe4af0d Merge pull request #7447 from mwerezak/manual-runtime
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
mwerezak
1546d9f293 Fixes #7406 2014-12-13 19:56:11 -05:00
mwerezak
e01d056b75 Fixes #6240 2014-12-13 19:50:28 -05:00
mwerezak
bef305dff1 Fixes handle_organs() being called twice in Life() 2014-12-13 19:50:12 -05:00
PsiOmega
efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
mwerezak
c554f70d88 Fixes colour mix up
Somehow phoron got the colour meant for inaprovaline.
2014-12-13 17:54:30 -05:00
SparklySheep
dfbe05ff8b Fixes a typo in the Hydroponics reagents 2014-12-13 14:59:56 -06:00
mwerezak
168cabf03a Fixes manual runtimes without modifying the construction of every object
Loads configuration before map creation instead.

This reverts commit 37b14bae39.
2014-12-13 09:35:36 -05:00
Chinsky
9536a92d60 Merge pull request #7442 from PsiOmegaDelta/CultGhost
Cult Ghost Manifestation
2014-12-13 17:06:10 +03:00
PsiOmegaDelta
0bba4e6f68 Merge pull request #7441 from sabiram/dev-freeze
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
2014-12-13 14:59:41 +01:00
Zuhayr
94d0fb99e2 Merge pull request #7439 from PsiOmegaDelta/RoundEndCut
Removes complete player round end listing.
2014-12-14 00:26:25 +10:30
Chinsky
4b9d185495 Merge pull request #7445 from Zuhayr/dev-freeze
Dev-freeze fixes.
2014-12-13 16:55:17 +03:00
Zuhayr
4c1f070f1b Merge pull request #7440 from Amunak/patch-1
Bringing back Secret.
2014-12-14 00:23:51 +10:30
Zuhayr
a79886ec59 Added icons to species select window, changed Sol Common to blue. 2014-12-13 23:55:06 +10:30
Zuhayr
fbd4e46a3c Added syllable sets for remaining languages. 2014-12-13 23:16:17 +10:30
Zuhayr
a704d1bf94 Merge branch 'languages' of https://github.com/Zuhayr/Baystation12 into dev 2014-12-13 23:13:40 +10:30
Zuhayr
0c9d9999b3 Removed now-redundant buckle check. 2014-12-13 23:11:59 +10:30
Zuhayr
d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2 Fixes #7290 2014-12-13 23:04:13 +10:30
Zuhayr
c569d52700 Fixes pretzels being unmakable (use a poppy instead of the seeds) 2014-12-13 22:46:55 +10:30
Zuhayr
e3b5c35822 Fixes simple_animal nuzzling. 2014-12-13 22:46:33 +10:30
Zuhayr
02fefbff54 Fixes #7345 2014-12-13 22:37:22 +10:30
Zuhayr
0ce52b086a Fixes #7371 2014-12-13 22:32:35 +10:30
Zuhayr
7770b355dd Fixes #7404 2014-12-13 22:15:13 +10:30
Zuhayr
2569fdc1c2 Fixes #7437 2014-12-13 21:58:06 +10:30
Zuhayr
473f78a562 Fixes #7408 2014-12-13 21:58:00 +10:30
Zuhayr
9b51078fdf Fixes #7410 2014-12-13 21:57:51 +10:30
Zuhayr
75d163705a Merge pull request #7419 from PsiOmegaDelta/Books
Fixes manual runtimes, ensures initialize is called even after round start
2014-12-13 21:50:35 +10:30
Zuhayr
8c3d179e78 Merge pull request #7434 from PsiOmegaDelta/World
Removes world messages.
2014-12-13 19:42:28 +10:30
Zuhayr
d6f13e98f7 Merge pull request #7425 from PsiOmegaDelta/PortaDupeFix
Prevents portable turret duplication.
2014-12-13 19:42:13 +10:30
Zuhayr
36f78ae38e Merge pull request #7430 from PsiOmegaDelta/Accounting
Fixes #7427.
2014-12-13 19:42:01 +10:30
Zuhayr
eafaef5cfa Merge pull request #7422 from PsiOmegaDelta/MovableCorpses
Makes remains movable/cleanable.
2014-12-13 19:40:44 +10:30
Zuhayr
b4e3b78392 Merge pull request #7418 from PsiOmegaDelta/Cryo
Crypods now displays the name of occupant.
2014-12-13 19:40:15 +10:30
Zuhayr
4a14e25026 Merge pull request #7426 from PsiOmegaDelta/NoIconLabCoat
Fixes labcoat without icon.
2014-12-13 19:39:23 +10:30
PsiOmegaDelta
009314a448 Merge pull request #7438 from mwerezak/chem-colours
Replaces dummy reagent colours
2014-12-13 09:17:37 +01:00
PsiOmegaDelta
2d15bb1312 Merge pull request #7435 from mwerezak/esword
Adds NOBLOODY to holoswords
2014-12-13 09:17:08 +01:00
Amunak
9cf4de5faa Removes redundant item info from circuitboard/mecha.
Also fixes capitalization.
2014-12-13 07:44:31 +01:00
Amunak
8961ee9014 Refactoring designs.dm.
They now use a better system of assigning names and descriptions. Removes the need to copypaste most of the lines. For now only computer boards were changed. Also attempt to do proper capitalization.
2014-12-13 07:43:46 +01:00
Amunak
c313a413ef Added macro for computer boards to assemble their name.
Adds the ability to change it from a single place. Also makes arguably cleaner code. Capitalization of nouns fixed.
2014-12-13 07:39:14 +01:00
Amunak
d3237d69e7 Updated circuitboard properties.
Moved stuff from circuitboard/mecha to just circuitboard, since it is basically the same item and they should all have the same properties.
2014-12-13 07:27:00 +01:00
Amunak
7de862cfe1 Fixed non-gamemode votes being unusable
Hopefully this doesn't break something else.
2014-12-13 07:21:09 +01:00
Amunak
41d81a14ef Buffed the research testing item, made more clear that it's for testing only. 2014-12-13 07:10:37 +01:00