Zuhayr
fa36451ec5
Merge pull request #3593 from Segrain/master
...
Helper fix.
2013-08-27 19:50:46 -07:00
Zuhayr
00c4859765
Merge pull request #3598 from zylowalsh/Door_Control-Fix
...
Update door_control.dm
2013-08-27 19:50:22 -07:00
Philip
66071c81ba
Update door_control.dm
...
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
2013-08-27 16:38:07 -06:00
Mloc
c9deeedb2f
Merge pull request #3595 from Erthilo/master
...
Fixes broken gender checks with hair
2013-08-27 15:02:40 -07:00
Erthilo
7a319904e4
Reverts gender checks as it was breaking with NEUTER and breaking facial hair.
2013-08-27 22:51:24 +01:00
Segrain
19db0df4b5
Fix for hiding cyborgs from upload console.
2013-08-27 19:50:35 +03:00
Segrain
e85ddd3b9a
Fix for unisex hairstyles.
2013-08-25 09:27:05 +03:00
Zuhayr
a5f79057d1
Merge pull request #3585 from Segrain/master
...
Hairfix.
2013-08-24 22:50:36 -07:00
Zuhayr
6e2d5b62b2
Merge pull request #3584 from Kilakk/master
...
Fixed medical HUDs not being able to set SSD status correctly
2013-08-24 22:19:10 -07:00
Kilakk
86d709e150
Fixed medical HUDs not being able to set SSD status correctly
2013-08-24 23:52:00 -04:00
Zuhayr
315ea1169f
Merge pull request #3576 from Kilakk/master
...
Fixes #3517 - AIs & borgs now get a 0th law when chosen by mongoose to be a tatortot
2013-08-23 21:43:10 -07:00
Kilakk
e634cd01f2
Fixes #3517
2013-08-23 14:21:08 -04:00
Segrain
5f8c8d9cce
Fix for negative damage.
2013-08-23 15:33:51 +03:00
Segrain
245d33c1af
Fix for invisible wounds.
2013-08-23 15:32:37 +03:00
Segrain
40909bde53
Deconstruction fix.
2013-08-23 15:31:37 +03:00
Segrain
cd2922cebe
Name fix.
2013-08-23 15:30:49 +03:00
Zuhayr
48811e3b4b
Merge pull request #3574 from Segrain/master
...
Smallfixes.
2013-08-23 04:42:29 -07:00
Segrain
acb4a01b9d
Compile fix.
2013-08-23 10:42:29 +03:00
Zuhayr
bc6993ff6a
Merge pull request #3573 from Segrain/master
...
Compile fix.
2013-08-22 23:43:52 -07:00
Zuhayr
3c139df703
Merge pull request #3569 from Mloc/hairfix
...
Small fixes to hair.
2013-08-22 22:48:11 -07:00
Zuhayr
24e9401e1b
Merge pull request #3570 from Mloc/clampfix
...
further checks against mobs being loaded by hydraulic clamps.
2013-08-22 19:51:12 -07:00
Mloc-Argent
1106845cb6
further checks against mobs being loaded by hydraulic clamps.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-22 15:54:28 +01:00
Mloc
e20f2e1409
Small fixes to hair.
...
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.
Signed-off-by: Mloc <colmohici@gmail.com >
2013-08-22 15:12:59 +01:00
Zuhayr
4dd448d200
Merge pull request #3567 from Segrain/master
...
Closets and lockers.
2013-08-21 23:19:39 -07:00
Segrain
57c1a9a556
Code cleanup.
2013-08-22 10:11:49 +03:00
Zuhayr
93df6ea2d4
Merge pull request #3566 from Mloc/master
...
Species will no longer draw hair not allowed for them. Mirrors will no ...
2013-08-21 15:51:58 -07:00
Mloc-Argent
5cee2d2ac2
Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles.
2013-08-21 23:26:59 +01:00
Mloc
740a44b600
Tweaked gitignore.
2013-08-21 20:27:14 +01:00
Mloc
29d4b9e422
Merge pull request #3561 from Erthilo/master
...
Fixes, emotes, books
2013-08-21 04:14:50 -07:00
Erthilo
d7fc84b42b
Better gender checks.
2013-08-21 09:59:07 +01:00
Erthilo
d3775875df
Revert "Experimentally readding Delete Book verb."
...
This reverts commit ec3000ecfb
2013-08-21 09:10:21 +01:00
Chinsky
a7a66a96ff
Merge pull request #3562 from Mloc/master
...
Removes alien virus.
2013-08-20 13:54:41 -07:00
Mloc-Argent
c188e46efc
Removes alien virus.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-20 21:54:37 +01:00
Erthilo
13caefe138
Uncomments Space Law book content.
2013-08-20 14:20:46 +01:00
Erthilo
b6900d50fc
Fixes admins not spawning as aliens on roundstart.
2013-08-20 14:20:33 +01:00
Erthilo
16d9b76599
Allow all mobs to emote. Standardising emote proc.
2013-08-20 10:38:57 +01:00
Erthilo
ec3000ecfb
Experimentally readding Delete Book verb.
2013-08-20 10:37:57 +01:00
Erthilo
de6eb16e1a
Fixes being able to have alien species hair on humans or other species.
2013-08-20 10:37:05 +01:00
Zuhayr
03fe5ef074
Merge pull request #3560 from Mloc/master
...
More dismemberment fixes
2013-08-19 19:20:26 -07:00
Mloc
de79aa733b
More dismemberment fixes
...
More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.
Signed-off-by: Mloc <colmohici@gmail.com >
2013-08-20 02:06:56 +01:00
Zuhayr
8015375732
Merge pull request #3559 from Mloc/master
...
Two fixes for dismemberment.
2013-08-19 15:51:28 -07:00
Mloc-Argent
b2a3405f80
Two fixes for dismemberment.
...
Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-19 23:49:53 +01:00
Mloc
1f3fc60cb4
Merge pull request #3556 from Segrain/master
...
Smallfix.
2013-08-19 12:49:26 -07:00
Segrain
71e52b57fe
Fix for #3552 .
2013-08-19 23:25:03 +03:00
Zuhayr
97a8347e6b
Merge pull request #3551 from Segrain/master
...
Pulling fixes.
2013-08-19 02:08:28 -07:00
Segrain
18b26c57b7
Inertia fix.
2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21
Fix for #3549 .
2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc
Merge pull request #3547 from Zuhayr/master
...
Borer prompt, dionaea fix
2013-08-19 01:27:11 -07:00
Zuhayr
67f3f5a3c4
Podmen prompt/spawn should work now.
2013-08-19 15:58:08 -07:00
Zuhayr
809c17710d
Borer prompt will now actually work without runtimes.
2013-08-19 15:46:40 -07:00
