Zuhayr
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
mwerezak
55baf1553f
Adjusts tradeband scrambling parameters
2014-12-22 00:19:56 -05:00
mwerezak
d74f49ce9b
Fixes shotgun shell description
...
Fixes shotgun shell description not indicating when a shell is spent.
2014-12-21 17:53:12 -05:00
Mloc-Argent
cf15517f8a
fix up airless turfs to be actually airless
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:36:11 +00:00
Mloc
5895615f72
Merge pull request #7377 from Amunak/ref
...
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
Mloc
66cb91d281
Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
...
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
c53d14d80c
Weapon type design datums will now get proper description.
...
Also fixes two names I forgot to fix before.
2014-12-18 05:28:41 +01:00
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
PsiOmegaDelta
9a4dd0b6ea
Merge pull request #7473 from Hubblenaut/dev-freeze
...
Context-base Combat Cleanup and Fixes
2014-12-17 23:18:14 +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
Atlantiscze
77fa2705dd
Ion laws (including the "random" ones by admins) are now more visible for the AI/robots.
...
Because single line of text is so easy to miss in spammed chat. Now it automatically shows output of show-laws verb which is significantly harder to miss.
2014-12-17 07:43:46 +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
Hubblenaut
4065dcb7e2
Fixes, fixes, and more fixes
2014-12-16 14:51:46 +01:00
Zuhayr
a5e30fae72
Fixes #7472
2014-12-16 18:24:01 +10:30
Zuhayr
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
Hubblenaut
8120a9b77f
Makes kicks and stomps their own unarmed_attack types
2014-12-15 18:54:07 +01:00
Chinsky
7683086619
Merge pull request #7464 from Zuhayr/dev-freeze
...
Fixes (at least some) of the recursive power-drain crash issues.
2014-12-15 16:38:40 +03: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
Hubblenaut
5fe9ca3df1
Species use a list for unarmed attack types
2014-12-14 22:48:14 +01: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
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
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
a79886ec59
Added icons to species select window, changed Sol Common to blue.
2014-12-13 23:55:06 +10:30
