GinjaNinja32
ccaf9a4edf
Change fleshbrains in MMIs to not be able to use :b
2014-12-26 14:18:01 +00:00
GinjaNinja32
ccece63d0b
Fix brain languages
2014-12-26 11:26:07 +00:00
mwerezak
f8ec11ddb2
Fixes traumatic_shock affecting species with NO_PAIN
2014-12-25 22:02:56 -05:00
Zuhayr
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
Zuhayr
3997129390
Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple.
2014-12-25 20:26:22 +10:30
Zuhayr
930e8c6e5d
Removes an unused debug var.
2014-12-25 20:09:45 +10:30
PsiOmegaDelta
3427787359
Merge pull request #7524 from Zuhayr/mutantrace
...
Species and organ fixes.
2014-12-25 10:56:17 +13:00
Zuhayr
31ba0d12e0
Fixes #6676 and #7375
2014-12-24 23:32:10 +10:30
Zuhayr
0263bc9c84
merge
2014-12-24 22:50:13 +10:30
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
e74c0c38e4
Fixes #5801
2014-12-24 22:00:31 +10:30
Zuhayr
4b030f30cd
Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.
2014-12-24 16:06:00 +10:30
PsiOmegaDelta
d1758a7162
Merge pull request #7510 from Zuhayr/mutantrace
...
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
2014-12-24 17:29:39 +13:00
Zuhayr
01f2d28187
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace
2014-12-24 12:47:56 +10:30
Zuhayr
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Hubblenaut
7988b78f69
No stomping when grabbing
2014-12-23 14:46:59 +01:00
Hubblenaut
d2a31eb024
Changes on kicks and stomps
2014-12-23 14:46:58 +01:00
Zuhayr
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
ccomp5950
0a63932d48
Simple Animals now no longer move while facing south all the time.
...
Fucking weirdo's
resolves #7396 for simple animals.
2014-12-22 21:44:48 -05:00
ccomp5950
66ac2d6e05
Added "give them their breath back" to admin_revive.
...
Prevents perpetual oxyloss after a revive.
2014-12-22 21:44:38 -05:00
ccomp5950
b446ccb2ab
Remove Borg nightvision when special views aren't selected.
...
Resolves #7452
2014-12-22 21:44:11 -05:00
Zuhayr
360775b96f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 00:01:09 +10:30
Zuhayr
3de0562dbe
Merge resolution.
2014-12-22 23:28:27 +10:30
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
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
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +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
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
Hubblenaut
4065dcb7e2
Fixes, fixes, and more fixes
2014-12-16 14:51:46 +01:00
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
Hubblenaut
5fe9ca3df1
Species use a list for unarmed attack types
2014-12-14 22:48:14 +01:00
Zuhayr
29a3d34ff0
Fixes (at least some) of the recursive power-drain crash issues.
2014-12-14 14:44:53 +10:30
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
Chinsky
9536a92d60
Merge pull request #7442 from PsiOmegaDelta/CultGhost
...
Cult Ghost Manifestation
2014-12-13 17:06:10 +03:00
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
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +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
