Amunak
a86f77d7ad
Final research refactoring and formatting
2014-12-18 04:59:33 +01:00
Amunak
417fe41248
Mining items path formatting
2014-12-18 04:58:40 +01:00
Amunak
619143186e
Moved design disk to research.dm; fixed disks' names
2014-12-18 04:00:51 +01:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
064357495d
Decreased fire delay on the unobtainable pulse funguns.
...
They were as lame as the death squad guns.
2014-12-18 03:13:04 +01:00
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
Amunak
4a7fdbf595
Removed unused substation batteryrack code.
2014-12-17 14:31:57 +01:00
Amunak
1a972974bc
Moves all circuitboards to their respective files.
...
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
Ccomp5950
8d65f8a87a
Merge pull request #7175 from atlantiscze/pewPEWPEWboom
...
[Ready To Merge] Emitter update
or how I might learn to love the revert button.
2014-12-16 21:17:54 -05:00
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
PsiOmega
f65ac4350f
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-15 08:56:11 +01:00
PsiOmegaDelta
845b858045
Merge pull request #7466 from GinjaNinja32/ninjas
...
Removes ninja mask, fixes ninja internals, fixes non-ninja voice changer
2014-12-15 08:53:05 +01:00
GinjaNinja32
f6b5edc130
Fixes error in rig voice-changer message
2014-12-15 05:39:00 +00:00
GinjaNinja32
1eddd1fea9
Span classes
2014-12-15 05:36:35 +00:00
PsiOmegaDelta
213d042f58
Merge pull request #7460 from mwerezak/stance
...
Fixes #7406
2014-12-14 10:08:41 +01:00
GinjaNinja32
16a7e2a4b9
Removes ninja mask, fixes ninja internals
2014-12-14 07:02:28 +00:00
Amunak
b2c266ff93
More research console GUI formatting.
...
Also simplified the <LI>st definitions.
2014-12-14 05:18:43 +01:00
Amunak
6bf59253fd
Fixes wrong shield design path
2014-12-14 05:16:49 +01:00
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
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
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
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
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
02fefbff54
Fixes #7345
2014-12-13 22:37:22 +10:30
Zuhayr
0ce52b086a
Fixes #7371
2014-12-13 22:32:35 +10:30
Zuhayr
2569fdc1c2
Fixes #7437
2014-12-13 21:58:06 +10:30
Zuhayr
9b51078fdf
Fixes #7410
2014-12-13 21:57:51 +10:30
Zuhayr
8c3d179e78
Merge pull request #7434 from PsiOmegaDelta/World
...
Removes world messages.
2014-12-13 19:42:28 +10:30
Zuhayr
36f78ae38e
Merge pull request #7430 from PsiOmegaDelta/Accounting
...
Fixes #7427 .
2014-12-13 19:42:01 +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
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
b60e9eedbe
Added detailed research information to R&D console
...
It lists 'desc' of each researched and 'buildable' datum/design, which was a previously unobtainable information. And it's all-access (just like technology level listing).
2014-12-13 07:08:39 +01:00
Amunak
6e15257df9
R&D console refactor, formatting and output format improvements
2014-12-13 07:06:42 +01:00
Amunak
6419f3426e
Destructor now asks for confirmation using alert instead of list
2014-12-13 07:02:54 +01:00
Zuhayr
cd096fd45b
Merge pull request #7385 from Zuhayr/dev-freeze
...
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
PsiOmega
9c6adfe590
Cult Ghost Manifestation
...
Turns out ghosts could be pulled into reality in two places.
This ensures both use the same method.
2014-12-13 00:13:55 +01:00
