Zuhayr
0dba5c14b4
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-28 20:40:19 -07:00
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
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
Zuhayr
799c2fc94c
Made Vox uncloneable.
2013-08-27 00:12:48 -07:00
Zuhayr
9565c94955
Secondary language fix.
2013-08-27 00:10:00 -07:00
Zuhayr
1b52559c72
Merged human.dm.
2013-08-26 22:45:11 -07:00
Zuhayr
856aa6a60b
Fixes #3555
2013-08-25 13:47:45 -07:00
Zuhayr
9d8f3d32f9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-25 13:26:08 -07:00
Zuhayr
8c58af4c65
Vox theft objectives should check lockers and other storage now.
2013-08-25 02:53:07 -07:00
Zuhayr
8c1f842b6a
Allowed changeling husks to be cloned.
2013-08-25 02:42:17 -07:00
Zuhayr
7e0d26dab1
Commented out APC switching from Malf AI.
2013-08-25 02:35:05 -07:00
Zuhayr
4ea434da1d
Added a delay to vent crawling.
2013-08-25 02:27:52 -07:00
Zuhayr
11c3de6da1
Got a vox shuttle check the wrong way around.
2013-08-25 02:15:28 -07:00
Zuhayr
8d01974057
Small language fixes, oops.
2013-08-25 02:13:23 -07:00
Zuhayr
64e705ba33
Adding radiation feeding to dionaea, tweaking species values, adding shock to lighting checks, adding light checks to diona nymphs.
2013-08-25 02:08:09 -07:00
Zuhayr
b0d4b1967b
Uncommented languages for experimental purposes.
2013-08-25 01:05:24 -07: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
97b0272e80
Added stealth engines to the Vox ship to allow the Exodus to hear that they are coming.
2013-08-24 21:24:41 -07:00
Kilakk
86d709e150
Fixed medical HUDs not being able to set SSD status correctly
2013-08-24 23:52:00 -04:00
Zuhayr
591cde1ccb
Emags now have a ten-use limit.
2013-08-24 19:25:05 -07:00
Zuhayr
25685c1492
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-24 18:02:11 -07:00
Zuhayr
d568023d45
Increased cooldown on vox shuttle engines to two minutes.
2013-08-24 15:42:53 -07:00
Zuhayr
d875d3e2f3
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-24 15:04:38 -07:00
Zuhayr
2216aed7ce
Merge pull request #3582 from alex-gh/add_rezadone
...
Ported Rezadone (Heals clone damage without cryo) from tg-station
2013-08-24 09:56:26 -07:00
Alex
01ac4be991
Ported Rezadone (Heals clone damage without cryo) from tg-station
2013-08-24 18:35:10 +02:00
Segrain
f1f6c07ded
Same mapfix, part 2. Also, minor update.
2013-08-24 09:35:14 +03:00
Zuhayr
d647147717
Merge pull request #3575 from DJSnapshot/master
...
game modes other than extended will not be announced (Also, pull request from master)
2013-08-23 21:43:58 -07:00
meyar
c0d264fed7
Fixes fire lockers. They actually start with stuff in them.
2013-08-23 20:39:08 -04:00
meyar
48dafb1904
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 20:02:16 -04:00
Kilakk
e634cd01f2
Fixes #3517
2013-08-23 14:21:08 -04:00
DJSnapshot
a33a70fb92
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 06:45:23 -07:00
DJSnapshot
2525f4f8aa
Moved hide_mode vars to global ticker instance.
2013-08-23 06:38:22 -07:00
DJSnapshot
7265509b1d
Added vars to change hide mode.
2013-08-23 06:22:07 -07:00
DJSnapshot
4bd67e83b8
Changed vote settings to game mode votes other than extended will not be announced.
2013-08-23 05:47:45 -07: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
Segrain
acb4a01b9d
Compile fix.
2013-08-23 10:42:29 +03:00
Zuhayr
2cf9a18f9e
Merge pull request #3572 from Baystation12/master
...
Merging master into dev.
2013-08-22 23:01:15 -07:00
Zuhayr
3c139df703
Merge pull request #3569 from Mloc/hairfix
...
Small fixes to hair.
2013-08-22 22:48:11 -07:00
Zuhayr
75896a8824
Fixes from Ravensdale to robot code, unsure of issue numbers.
2013-08-22 16:10:06 -07:00
Zuhayr
4085aaf49b
Added two verbs to dionaea nymphs, gave them their own file.
2013-08-22 16:03:37 -07:00
Zuhayr
493dded8fb
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-22 15:29:59 -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
