Commit Graph

9586 Commits

Author SHA1 Message Date
Zuhayr
b4371916de Replaced some magic numbers. 2014-12-28 17:33:09 +10:30
Zuhayr
8d7b68d1f5 Fixes double space issue with pain emotes. 2014-12-28 17:19:30 +10:30
Ccomp5950
5e7b95ad14 Merge pull request #7543 from Zuhayr/xenofixes
Xeno fixes.
2014-12-27 22:03:38 -05:00
Zuhayr
85fe8b293b Merge pull request #7544 from Zuhayr/dev-freeze
Several fixes.
2014-12-28 13:10:02 +10:30
Ravensdale
358e6c0d70 Wording tweak1 2014-12-27 14:23:59 -08:00
Ravensdale
1e90bf460c Fixes a comment, bleh. 2014-12-27 10:57:13 -08:00
Ravensdale
da6a6961ce Corrected oversight 2014-12-27 10:45:55 -08:00
Ravensdale
93db93cd51 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into essEssDee 2014-12-27 10:26:24 -08:00
Ravensdale
393593046e Overhauls SSD mechanic. 2014-12-27 09:16:50 -08:00
Zuhayr
011b9a6c1f Amending stun commit.
Stun will properly be set to 0 if the species has NO_PAIN.
2014-12-27 09:20:12 +10:30
PsiOmegaDelta
3e333ee1dc Merge pull request #7541 from GinjaNinja32/posilang
Fix brain/posibrain languages
2014-12-27 11:29:56 +13:00
Zuhayr
36d5525437 Extremely minor runtime fix. 2014-12-27 08:45:30 +10:30
Zuhayr
49ca5ee0ca NO_PAIN will now properly stop hard stun from taking effect. 2014-12-27 08:29:58 +10:30
mwerezak
7c65de3e34 Improves power monitor UI
Improves power monitor sensor list UI. Fixes #7449
2014-12-26 16:55:03 -05:00
Zuhayr
8acb3b6402 Typo from robotslash commit. 2014-12-27 08:19:16 +10:30
Zuhayr
4a9a6636a0 Fixed incorrect cuff resist time when species with can_shred() resisted. 2014-12-27 08:11:35 +10:30
Zuhayr
e3cec50583 Fixed incorrect role check on leap(). 2014-12-27 08:11:18 +10:30
Zuhayr
b073c03708 Added xenomorph exclusions to space suits and helmets. 2014-12-27 08:10:55 +10:30
Zuhayr
86cd10057d Fixed brain transplant issue. 2014-12-27 08:10:21 +10:30
Zuhayr
0511ea9567 Added proc for can_shred() on robots. 2014-12-27 08:10:05 +10:30
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
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
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
83c17750c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 12:56:17 +10:30
PsiOmegaDelta
5b03184e9c Merge pull request #7491 from Mloc/bs12-sleepyedges
atmos changes; sleepy edges and hardy rwalls
2014-12-22 20:04:08 +01:00
Amunak
15b4c1f5fe Fixes shield circuit board research designs 2014-12-22 15:25:34 +01:00
Zuhayr
360775b96f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:01:09 +10:30
Zuhayr
f55f9c7fce Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:00:48 +10:30
Mloc
f647906f3d Merge pull request #7492 from mwerezak/casings
Fixes shotgun shell description
2014-12-22 13:29:32 +00:00
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
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