Zuhayr
8d98fe7582
Merge resolution.
2013-08-19 16:07:03 -07:00
Zuhayr
3e70c949e6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-19 16:04:34 -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
Zuhayr
5bd6170e0c
Diona will now be born from pods as nymphs.
2013-08-19 15:20:13 -07:00
Zuhayr
68285fd85b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-19 15:06:28 -07:00
Zuhayr
cffac0bfc2
Using dev map.
2013-08-19 15:05:44 -07:00
Zuhayr
320a009e2d
Made Dionaea whitelisted.
2013-08-19 12:38:48 -07:00
Zuhayr
6d8bb8dfe6
Hopefully a fix for Dionaea weirdness regarding pods.
2013-08-19 11:53:24 -07:00
Zuhayr
e05976e1b9
Confirmation prompt for borers.
2013-08-19 11:53:03 -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
Kilakk
abe170e006
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
baystation12.dme
2013-08-19 00:27:28 -04:00
Kilakk
83bc47a47e
Temporary fix for #3543 , gave bees an icon_dead state
...
* Also, possibly stopped bees from moving around while deceased (in this case, while not having stat CONSCIOUS)
* Bees don't have an actual death icon, just a placeholder bees1 for now
2013-08-18 23:47:11 -04:00
Kilakk
8d2910da37
Bees are simple_animals, not machines. Bluh.
2013-08-18 22:52:39 -04:00
Kilakk
6d2cd82a14
Added a fax machine to send messages to centcom with.
...
* Formatting can be seen by admins
* HTML tags can be used in replies
* Replies are sent directly to the fax machine and have a fancy stamp on them
* Currently uses access_lawyer but this might change
2013-08-18 14:39:08 -04:00
Zuhayr
e73fea52aa
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-18 02:09:06 -07:00
Segrain
2304b743ce
Reagent scanner's addition.
2013-08-17 17:00:33 +03:00
Segrain
8456647120
Type check.
2013-08-17 16:58:57 +03:00
Zuhayr
02b5cdaca3
Merge pull request #3541 from Mloc/dsayfix
...
Much more probable fix for deadchat breaking on clientless ghosts.
2013-08-17 06:18:25 -07:00
Mloc-Argent
404c12f61e
Much more probable fix for deadchat breaking on clientless ghosts.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-17 14:18:01 +01:00
Zuhayr
ecce26f07b
Allowed monkeys to use radios.
2013-08-17 19:59:52 -07:00
Zuhayr
5e93bfa8c4
Missing a paren.
2013-08-17 19:24:13 -07:00
Zuhayr
1fa95ab1bf
Allowed whispers to reach host brains.
2013-08-17 19:17:47 -07:00
Zuhayr
4f553eab06
Allowed captive brains to actually understand things.
2013-08-17 19:15:11 -07:00
Zuhayr
b9aa75e877
Added a headgear check to borer infestation.
2013-08-17 19:11:34 -07:00
Zuhayr
a30f7167bd
Removed outdated var, fixed failure to show garbled monkey speech.
2013-08-17 19:03:20 -07:00
Zuhayr
9cab832513
Fixed issues with ;.
2013-08-17 18:41:29 -07:00
Zuhayr
f83018904d
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-17 18:07:43 -07:00
Mloc
6ea99aff32
Disabled airlock heat transfer after community vote.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2013-08-17 01:03:13 +01:00
Mloc-Argent
ebc19424e0
Fix for minute traces of toxins in the air causing firestorms.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-17 00:19:28 +01:00
Mloc-Argent
e809be825e
Merge branch 'master' into dev
...
Conflicts:
code/modules/mob/say.dm
2013-08-16 22:22:42 +01:00
Segrain
2ea03c0925
Fix for #3535 .
2013-08-17 00:26:27 +03:00
Zuhayr
9c58348879
Holodeck exploit fix.
2013-08-17 04:41:28 -07:00
Zuhayr
2bc8212d2a
Fix for subtypes of X mob not being able to understand each other.
2013-08-16 19:00:08 -07:00
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
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
