Mloc
53de412107
Merge pull request #5493 from Zuhayr/master
...
Fixes
2014-07-04 19:28:54 +01: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
b670cdcdf1
Fixes #5483
2014-07-04 17:48:12 +09:30
PsiOmega
b86b80f963
Fixes #5487
...
Isolation air alarms now expect atmos, engineering, OR research access.
2014-07-04 00:28:06 +02: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
Chinsky
5724a77cdb
Merge pull request #5474 from Zuhayr/master
...
Fixes climbing through shutters.
2014-07-03 20:38:56 +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
Chinsky
e21206340e
Merge pull request #5470 from Walter0o/patch-1
...
trivial silicon show_system_integrity() fix
2014-07-03 05:13:21 +04:00
Chinsky
a3cff314bd
Merge pull request #5466 from Hubblenaut/master
...
Fixes Sasha Mason-Kalinka's custom item
2014-07-03 05:10:49 +04:00
Chinsky
67c425fe2b
Merge pull request #5463 from mwerezak/emergency-shuttle
...
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
2014-07-03 05:10:35 +04: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
Hubblenaut
dfece9fe12
Stops buckled mobs from slipping (for now)
2014-07-02 22:36:49 +02:00
Zuhayr
b690f927ba
Fixes #5472
2014-07-03 05:20:29 +09:30
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
Hubblenaut
d8f1b255a2
Fixes Sasha Mason-Kalinka's custom item
2014-07-02 10:16:15 +02:00
mwerezak
5a91dc8176
Fixes bad emergency shuttle can_force() check
2014-07-01 22:40:15 -04:00
mwerezak
e57419c725
Status displays now won't blank when undocking, too
2014-07-01 22:18:04 -04:00
mwerezak
2a4600c80c
Makes the escape shuttle NanoUI window bigger
2014-07-01 22:13:59 -04:00
mwerezak
1c7c48165b
Reduces docking timeout to 20 seconds
2014-07-01 21:55:13 -04:00
mwerezak
191b4763b6
Fixes status displays blanking out when escape shuttle is about to launch
2014-07-01 21:54:50 -04: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
5a2e9ea298
Resets emergency shuttle authorization on arrival
2014-06-30 15:14:44 -04:00
mwerezak
9991b46ea6
long_jump() now uses an arrive_time var instead of sleeping the whole time.
...
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
2014-06-30 15:14:20 -04:00
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
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
574d07f8d9
Fixes #5410 and possibly #5399
2014-07-01 01:04:29 +09:30
Zuhayr
4367d37332
Somehow when I added spawnpoints I put them in the wrong place. Moved the file.
2014-07-01 01:04:19 +09:30
