Zuhayr
b8e81f31d3
Fixes #5595
2014-07-14 10:18:37 +09:30
Zuhayr
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
mwerezak
c0487b9c90
Fixes human internal organs list
2014-07-12 16:15:37 -04:00
DJSnapshot
0e5b7dea5b
Merge pull request #5565 from Zuhayr/newgear
...
Custom gear loadouts.
2014-07-11 14:40:05 -07:00
Walter0o
b6856eac8b
can't trust players with anything
2014-07-11 09:19:23 +02:00
Ccomp5950
e44bcf81fe
Merge pull request #5559 from Walter0o/deadly_fork_fix
...
deadly sharp w_class 1 fix
2014-07-10 23:40:25 -05:00
Zuhayr
d2c57115ed
Added glass to the engineering module.
2014-07-11 13:55:21 +09:30
Zuhayr
0d21889bee
Fixed some bugs, did some testing, moved some procs around for robot functionality.
2014-07-11 13:50:34 +09:30
Zuhayr
8f09c557f9
Added paperwork handler, clerical gripper, some other tweaks.
2014-07-11 13:12:01 +09:30
Zuhayr
70ba371658
Merge resolution.
2014-07-11 12:47:16 +09:30
Zuhayr
55d52ef1f4
Cleaned up a little oversight.
2014-07-11 12:25:08 +09:30
Zuhayr
903679bd79
More work on gear loadouts.
2014-07-11 11:47:53 +09:30
Zuhayr
81f27320f3
Removes vox as a spawn race.
2014-07-11 08:52:09 +09:30
Walter0o
a3cc178ad6
adjusts examine for w_class 1 yankability
2014-07-10 19:58:20 +02:00
Walter0o
10ab66aa40
adjusts verb for w_class 1 yankability
2014-07-10 19:58:16 +02:00
Walter0o
9827838917
shrapnel check for human get_visible_implants()
2014-07-10 19:58:01 +02:00
Zuhayr
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
Zuhayr
326f3821e1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-09 15:52:31 +09:30
unknown
9297b56b7a
Cyborgs now understand all languages besides vox-pidgin
2014-07-08 16:01:44 -04:00
Zuhayr
6499385279
Temp commit with robot module work
2014-07-08 19:44:33 +09:30
Hubblenaut
a6e6a8939f
Cleans code up for easier editing
2014-07-08 07:39:49 +02:00
Hubblenaut
6568533d0d
Fixes canmove updating wrongly on movable chairs
2014-07-08 04:48:21 +02:00
mwerezak
6f2fff4a5e
Increases the time it takes for germ_level to rise to ambient
2014-07-06 15:45:44 -04:00
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
21e625d89b
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
2014-07-05 16:48:59 +09:30
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
