Mloc-Argent
64d2a69a32
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
Mloc
bda1dac41c
Merge pull request #5502 from mwerezak/robot-actuator
...
Fixes #5499
2014-07-05 11:33:04 +01:00
Zuhayr
c9ca3cc43e
Removes NO_BLOOD from Vox.
2014-07-05 16:04:10 +09:30
mwerezak
d538c5c640
Fixes #5499
2014-07-04 19:35:57 -04:00
Mloc-Argent
25ec90ba26
mob: fix a movement issue
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-04 17:54:25 +01:00
Zuhayr
e260cf5129
Merge pull request #5480 from Hubblenaut/master
...
Fixes earmuffs and custom items for ear slot not showing up properly
2014-07-04 04:41:25 +09:30
Chinsky
447144f1ad
Merge pull request #5477 from PsiOmegaDelta/AngryAI
...
Adds a new set of AI status emotes.
2014-07-03 20:39:51 +04:00
Zuhayr
07acb270d1
Merge pull request #5476 from Hubblenaut/wheelchair
...
Wheelchair Fixes
2014-07-03 13:16:14 +09:30
Hubblenaut
3d1195d1a7
Hides ear equipment on BLOCKHAIR and BLOCKHEADHAIR flags
2014-07-03 03:43:15 +02:00
Hubblenaut
4f7dc5c9f5
Renders ears above hair level, fixes rendering of earmuffs and custom item
2014-07-03 03:30:16 +02:00
PsiOmega
a9c6a8cd03
Adds an Upset emote as well.
2014-07-03 00:22:10 +02:00
PsiOmega
0892d6315d
Adds a new set of AI status emotes.
...
The AI can now express anger and surprise.
2014-07-02 23:09:46 +02:00
Hubblenaut
4981f3409f
Fixes wrong person getting movement penalty
2014-07-02 22:43:17 +02:00
Hubblenaut
164bf15166
Minor code cleanup
2014-07-02 22:42:53 +02:00
Hubblenaut
97f997dd30
Fixes in wheelchair and different handling of movement
2014-07-02 22:42:18 +02:00
Walter0o
3bab559fc8
fixes weird drone health status
...
a non-damaged drone has 35 health and 35 maxHealth.
in the current proc, that is shown as (( 35 +35)/(35*2))*100 = 100 % health
a drone at half its health has 17.5 health.
current proc : (( 17.5 +35)/(35*2))*100 = 75 % health
a dead drone has 0 health.
current proc : ( 0 +35)/(35*2))*100 = 50 % health
as i fixed this proc in the silicon parent proc, this can be removed.
2014-07-02 18:15:08 +02:00
Walter0o
292f8adfe0
fixes weird silicon health status
...
a non-damaged cyborg has 200 health.
in the current proc, that is shown as (200+100)/2 = 150 % health
a dead borg has 0 health.
in the current proc, that is shown as (0+100)/2 = 50 % health
2014-07-02 18:06:25 +02:00
Zuhayr
b9c6b7b77d
Merge with master.
2014-07-02 06:59:11 +09:30
mwerezak
146d1f30d5
Readds check for sharp && !ismob(W.loc)
2014-07-01 16:47:56 -04:00
mwerezak
6cfee05c8f
Fixes #5446
2014-07-01 16:39:57 -04:00
Zuhayr
a6c9b1d81b
Fixes #5446
2014-07-02 05:35:56 +09:30
Zuhayr
ff475635b7
Fixes #5448
2014-07-02 05:31:53 +09:30
Zuhayr
7889ac25ab
Fixed embedding.
2014-07-01 10:12:58 +09:30
Mloc-Argent
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Chinsky
5cfcb2d452
Merge pull request #5423 from Zuhayr/dev
...
Vox icon fixes.
2014-07-01 02:20:51 +04:00
Zuhayr
d30457b97c
Bandaid for overly fragile hardsuits.
2014-07-01 07:47:49 +09:30
Chinsky
8d81675509
Merge pull request #5420 from mwerezak/emergency-shuttle
...
Fixes #5418 - also a bunch of small shuttle fixes
2014-07-01 02:10:23 +04:00
mwerezak
c147eb9034
Improves the display of shuttle ETAs
2014-06-30 18:00:28 -04:00
Zuhayr
f1d83d3f94
Fixed some vox icons.
2014-07-01 07:29:30 +09:30
mwerezak
952bba6a38
Fixes #5336
2014-06-30 14:43:45 -04:00
Zuhayr
dd43ba993a
Fixes #5415
2014-07-01 02:46:35 +09:30
Zuhayr
fcc679385c
Fixes #5387
2014-07-01 02:46:16 +09:30
Zuhayr
ae9bd07bd8
Merge pull request #5400 from comma/robust-squash
...
Robust squash
2014-07-01 01:11:43 +09:30
Zuhayr
8c2c690ec7
Fixes #5296
2014-07-01 01:05:05 +09:30
Zuhayr
bd5bc07064
Fixes #5090
2014-07-01 01:04:58 +09:30
Zuhayr
ef5387fece
Fixes #5113
2014-07-01 01:04:50 +09:30
Zuhayr
b50d42d80c
Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.
2014-07-01 01:03:50 +09:30
Zuhayr
e0d1bb1923
Merge pull request #5398 from comma/overmap
...
Overmap
2014-06-30 20:11:22 +09:30
Chinsky
2d6e48c2e7
Merge pull request #5389 from mwerezak/sign-lang
...
Improves non-verbal furry languages, fixes vox shriek playing for deaf people and in space
2014-06-29 23:05:16 +04:00
Chinsky
145bfe9770
Implemented suggestions from PR
2014-06-29 19:24:19 +04:00
Chinsky
a6c7093818
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash
...
Conflicts: lots
2014-06-29 19:16:36 +04:00
Higgin
2556d3f227
Stunbatons now run on charge.
...
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
2014-06-29 17:46:06 +04:00
Chinsky
e7684dd6e9
Adds overmap system and examples of it's usage.
...
Unticked, as it disables space edge transition.
2014-06-29 06:48:21 +04:00
mwerezak
112bfbc6c3
Removes taj whisker emote
2014-06-28 19:52:00 -04:00
Zuhayr
cf1abf65d9
Added better checks to leap(), prevented leap spamming (hopefully).
2014-06-29 09:20:04 +09:30
mwerezak
7189dc9d0d
Tweaks nonverbal emote frequency
2014-06-28 12:20:20 -04:00
mwerezak
ac0bf7b853
Improves the implementation of non-verbal languages
...
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
2014-06-28 12:19:34 -04:00
mwerezak
b25f5d8aa6
In space, no one can hear you shriek
...
Or chimper for that matter. Also fixes deaf people hearing vox shriek.
2014-06-28 10:35:20 -04:00
Zuhayr
44d6bc199a
Merge pull request #5379 from PsiOmegaDelta/AIStun
...
AI now handles the sunned status like other creatures do in their life.dm file
2014-06-28 19:43:27 +09:30
PsiOmega
972bbac033
AI now handles EMP-stun like other creatures do in their life.dm file
...
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
2014-06-27 21:24:01 +02:00
