Mloc
|
326b51f4a4
|
Merge pull request #3531 from Zuhayr/dev
Languages/species mucking around.
|
2013-08-16 11:33:03 -07:00 |
|
Zuhayr
|
3569529d51
|
Added languages to monkey variants.
|
2013-08-17 04:17:21 -07:00 |
|
Zuhayr
|
387fbff346
|
Added some varying temperature and pressure values for different species.
|
2013-08-17 04:15:16 -07:00 |
|
Zuhayr
|
9743fe673b
|
Added NO_BREATHE flag check in human Life() proc.
|
2013-08-17 04:14:54 -07:00 |
|
Zuhayr
|
f90dcdeaee
|
Added Diona language, Rootspeak.
|
2013-08-17 03:47:05 -07:00 |
|
Zuhayr
|
f6486ad9fd
|
Removed Pierrot's Throat and miming code from say.dm.
|
2013-08-16 18:07:32 -07:00 |
|
Zuhayr
|
94db7a2dc1
|
These files have been collapsed into root procs and can be deleted.
|
2013-08-16 17:48:25 -07:00 |
|
Zuhayr
|
1e9cb31fec
|
A ton of preliminary work condensing say_quote and say_understands down to the basic common procs between mob types.
|
2013-08-16 17:46:07 -07:00 |
|
Zuhayr
|
4da487ad89
|
Brain borers can now take monkeys as hosts.
|
2013-08-16 16:24:25 -07:00 |
|
Zuhayr
|
24fdd557ee
|
Icon adjustments for nymphs and dionaea.
|
2013-08-16 16:07:42 -07:00 |
|
Zuhayr
|
72822b7f73
|
Allows subtypes to understand/speak to the parent type.
|
2013-08-16 13:41:35 -07:00 |
|
Zuhayr
|
319bdcc069
|
Added diona nymphs as diona monkey-analogues.
|
2013-08-16 13:39:36 -07:00 |
|
Zuhayr
|
7b1c0ff49e
|
Using dev map.
|
2013-08-16 13:04:22 -07:00 |
|
Mloc
|
4796f8439e
|
Merge pull request #3529 from Zuhayr/dev
Fixes form master, Unathi<->Soghun removal, dionaea changes, lots of say refactoring.
|
2013-08-16 05:07:42 -07:00 |
|
Zuhayr
|
2f58a6fe62
|
Merge pull request #3527 from comma/dev
Removes Alien syndrome because it kinda does not make sense.
|
2013-08-15 20:23:29 -07:00 |
|
Chinsky
|
34cd3cdedf
|
Removes Alien syndrome because it kinda does not make sense.
|
2013-08-16 07:14:57 +04:00 |
|
Zuhayr
|
8df4c42c63
|
Merge pull request #3523 from Mloc/dsayfix
Probable fix for deadchat randomly breaking.
|
2013-08-15 17:27:11 -07:00 |
|
Mloc
|
7ffb680cdd
|
Merge pull request #3524 from SkyMarshal/airfixes
Fixes a derp with the insulation code.
|
2013-08-15 15:12:49 -07:00 |
|
Mloc
|
c7f92ebc6d
|
Merge pull request #3525 from Segrain/master
Postmerge mapfixes.
|
2013-08-15 15:12:31 -07:00 |
|
Segrain
|
3722bf97df
|
Postmerge mapfixes again.
|
2013-08-15 21:03:14 +03:00 |
|
SkyMarshal
|
9f540e2606
|
Fixes a derp with the insulation code.
|
2013-08-15 10:03:51 -07:00 |
|
Mloc-Argent
|
85d3d2787e
|
Probable fix for deadchat randomly breaking.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
|
2013-08-15 17:34:03 +01:00 |
|
Mloc
|
98ae51e928
|
Merge pull request #3522 from Zuhayr/master
Removing snowflake checks for Soghun.
|
2013-08-15 08:02:20 -07:00 |
|
Zuhayr
|
9e58d93fd6
|
Removing snowflake checks for Soghun.
|
2013-08-16 01:01:12 -07:00 |
|
Mloc-Argent
|
1e980a9cc1
|
Merge branch 'master' into dev
|
2013-08-15 15:29:53 +01:00 |
|
Zuhayr
|
ccc004f2ce
|
Merge pull request #3521 from LethalGhost/patch-4
Remove useless code
|
2013-08-15 02:42:05 -07:00 |
|
Zuhayr
|
d508fd84c2
|
Merge pull request #3520 from Segrain/master
Smallfix.
|
2013-08-15 02:40:57 -07:00 |
|
Segrain
|
fa76668500
|
Colouring tempfix.
|
2013-08-15 10:29:29 +03:00 |
|
Lethal Ghost
|
5c958fe6b6
|
Remove useless code
|
2013-08-15 13:17:06 +06:00 |
|
Zuhayr
|
401130fc54
|
Merge pull request #3519 from Mloc/mapclean
Mapclean
|
2013-08-14 20:37:54 -07:00 |
|
Mloc
|
58c557267f
|
updated maptools batch files for new map name
Signed-off-by: Mloc <colmohici@gmail.com>
|
2013-08-15 01:25:11 +01:00 |
|
Mloc
|
0de45f5499
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2013-08-15 01:11:53 +01:00 |
|
Mloc
|
b8729127b2
|
Merge pull request #3518 from DJSnapshot/master
Fixed Navy warden dark variation clothes disappearing when resting.
|
2013-08-14 17:11:25 -07:00 |
|
DJSnapshot
|
f90755695b
|
Fixed Navy warden dark variation clothes disappearing when resting.
|
2013-08-14 17:05:50 -07:00 |
|
Mloc
|
d3a44d9855
|
Merge branch 'master' of github.com:Baystation12/Baystation12
|
2013-08-15 01:04:45 +01:00 |
|
Mloc
|
ff1f90dd38
|
Cleanup of maps folder.
Removed every excess map, leaving only tgstation2.dmm, formerly tgstation.2.1.0.0.1.dmm.
Signed-off-by: Mloc <colmohici@gmail.com>
|
2013-08-15 01:02:16 +01:00 |
|
Zuhayr
|
d937900d13
|
Compile fix.
|
2013-08-14 10:29:17 -07:00 |
|
Zuhayr
|
1c30387a44
|
Merge resolution in Engineering.dm
|
2013-08-14 10:05:55 -07:00 |
|
Jim "Apples"
|
7292433169
|
Merge pull request #3515 from Zuhayr/master
Engineering merge.
|
2013-08-14 03:04:25 -07:00 |
|
Zuhayr
|
033b0450a0
|
Engineering merge.
|
2013-08-14 20:00:38 -07:00 |
|
Zuhayr
|
c19d136996
|
Podman fix.
|
2013-08-14 19:58:39 -07:00 |
|
Jim "Apples"
|
b019a9709c
|
Merge pull request #3514 from Zuhayr/master
Podman fix.
|
2013-08-14 03:00:03 -07:00 |
|
Chinsky
|
b8dc7cc939
|
Merge pull request #3505 from Zuhayr/master
Language cleanup/mouse speech fix.
|
2013-08-13 16:48:45 -07:00 |
|
Zuhayr
|
f6a562e8ed
|
Couple of typos.
|
2013-08-14 09:47:52 -07:00 |
|
Zuhayr
|
45a26fcad9
|
Removed a debug string.
|
2013-08-14 02:19:36 -07:00 |
|
Zuhayr
|
64c5beaf8c
|
Forgot to change back some testing keys for languages, whoops.
|
2013-08-14 02:16:11 -07:00 |
|
Zuhayr
|
9ec5c72d96
|
Cleaned up language handling, fixed mouse speech understanding.
|
2013-08-14 02:13:06 -07:00 |
|
Zuhayr
|
e10a433800
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2013-08-14 01:01:18 -07:00 |
|
Zuhayr
|
623a2978b7
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
|
2013-08-14 01:01:09 -07:00 |
|
Zuhayr
|
1bdb1b6694
|
Merge pull request #3507 from Segrain/master
Internals for everyone.
|
2013-08-13 16:39:14 -07:00 |
|