Zuhayr
92d3e6d240
Fixes Yongauni#155
2015-08-30 11:45:54 +09:30
Chinsky
9edeb3cc08
Merge pull request #10908 from Matthew951/8-27-2015-adds-Volaju-hair
...
Adds a new set of hair and facial hair
2015-08-29 23:26:30 +03:00
Zuhayr
dfbdd79375
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
2015-08-29 16:53:42 +09:30
Zuhayr
7d82e4850e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-29 16:53:07 +09:30
Zuhayr
165f30b274
Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime
...
Alters the round duration format, increases Stat inactivity timeout.
2015-08-29 07:41:23 +09:30
Daranz
d5b618adac
Fix Say ":i" working with intercoms, re-add restraint check for Say ":i"
...
See also commits:
e9d9ff57babbc8ad6383b9dbeeb356
2015-08-28 17:33:52 +02:00
Matthew951
78a129db9d
Adds a new set of hair and facial hair
...
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
2015-08-27 14:47:02 -04:00
PsiOmega
c5e09c30d6
Alters the round duration format, increases Stat inactivity timeout.
...
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
2015-08-27 20:01:38 +02:00
PsiOmegaDelta
bf3040cc2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ZAS/Controller.dm
code/modules/admin/verbs/adminsay.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/stripping.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-08-27 08:53:22 +02:00
Zuhayr
701282d2b0
Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping
...
Must now be adjacent to mobs you are stripping.
2015-08-27 06:51:54 +09:30
PsiOmegaDelta
9c5aba72f0
Must now be adjacent to mobs you are stripping.
...
Fixes #10884 .
2015-08-26 08:12:02 +02:00
PsiOmegaDelta
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Kearel
ea402d6714
#10833 +
2015-08-24 19:20:56 -05:00
Kearel
d1504b49b9
Fixes #10833
2015-08-24 18:12:38 -05:00
PsiOmega
f28fa29d54
Having organs should no longer prevent vent crawling.
2015-08-24 17:27:22 +02:00
PsiOmega
1a11aa7f5c
Shuffles de-equipping logic.
2015-08-24 14:24:31 +02:00
PsiOmegaDelta
3de6d1b19c
Merge pull request #10381 from Zuhayr/hardsuitcontrol
...
Rig AI movement and module control buffs.
2015-08-24 12:04:31 +02:00
Zuhayr
c5972cb421
Removing an istype() check.
2015-08-24 19:03:57 +09:30
Zuhayr
c6964a9b0e
Fixes for previous commits.
2015-08-24 18:31:52 +09:30
PsiOmegaDelta
e29f4eb3c1
Compilation and map merge fixes.
2015-08-24 10:45:08 +02:00
PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
Zuhayr
e8bf2e4b8f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
2015-08-24 16:41:39 +09:30
Zuhayr
ddcf7ec282
Merge pull request #10837 from mwerezak/brainloss-fix
...
Fixes adjustBrainLoss
2015-08-24 15:24:12 +09:30
Kearel
e8b779a34a
language bug fix
2015-08-23 22:37:32 -05:00
mwerezak
5bcede5801
Fixes adjustBrainLoss
...
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
2015-08-23 20:22:15 -04:00
Chinsky
13257b52c4
Merge pull request #10824 from mwerezak/stump-desc-fix
...
Fixes limb stump examine text
2015-08-24 00:31:05 +03:00
Ccomp5950
517b685950
Merge pull request #10822 from mwerezak/antag-fix
...
Antag Fixes
2015-08-23 16:24:42 -04:00
mwerezak
3c86715474
Fixes limb stump examine text
2015-08-23 15:35:45 -04:00
mwerezak
161e5c14cd
Fixes #10819
2015-08-23 14:34:58 -04:00
PsiOmega
579c5be239
Makes observers use forceMove.
...
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
2015-08-23 17:45:46 +02:00
volas
d31203c70f
Sanitize for AI emergency message
2015-08-23 15:24:52 +03:00
Zuhayr
9cbacd6653
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
...
Conflicts:
code/_onclick/click.dm
2015-08-23 02:24:34 +09:30
GinjaNinja32
222049dd3c
Merge pull request #10791 from Zuhayr/speciestweaks
...
Species tweaks
2015-08-22 17:50:43 +01:00
Zuhayr
90e51b87e3
Refactoring hardsuit click checking.
2015-08-23 02:14:55 +09:30
mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
PsiOmegaDelta
8f431c3832
Merge pull request #10801 from mwerezak/movement-cooldown
...
Adds missing TK move cooldowns, fixes #10800
2015-08-22 10:50:13 +02:00
mwerezak
a9f6d01647
Fixes #10800
...
Also does some minor refactoring and removes a duplicate check
2015-08-22 01:55:26 -04:00
Chinsky
bd9b6fd4c6
Merge pull request #10771 from DelZeta/MRGLGRGLGR
...
Fixes permahallucinations.
2015-08-22 05:33:34 +03:00
Zuhayr
8564db4643
I am a fucking moron.
2015-08-22 04:10:44 +09:30
mwerezak
4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
Zuhayr
1d13b989df
Gluttonous var changes.
2015-08-22 03:33:18 +09:30
Zuhayr
23fa130d6a
Species attack damage nerfs.
2015-08-22 03:33:18 +09:30
Zuhayr
6841776992
Taj/Unathi slowdown and burn/brute malus tweaks.
2015-08-22 03:33:18 +09:30
Zuhayr
69dfd23d1b
Compile fix.
2015-08-22 03:26:41 +09:30
