meyar
48dafb1904
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 20:02:16 -04:00
Segrain
245d33c1af
Fix for invisible wounds.
2013-08-23 15:32:37 +03:00
Zuhayr
2cf9a18f9e
Merge pull request #3572 from Baystation12/master
...
Merging master into dev.
2013-08-22 23:01:15 -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
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
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
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
de6eb16e1a
Fixes being able to have alien species hair on humans or other species.
2013-08-20 10:37:05 +01:00
Mark Aherne (Faerdan)
5f4cc7e108
Nano UI Framework
...
------------------------------------------------------------
nanoui - For creating and updating browser UIs
manomanager - For managing nanouis
Includes the "D:\Development\SS13-TG\code\game\machinery\cryo.dm" rebuilt using Nano.
Templates are stored in /nano/templates
This code is in development, it's also not commented yet.
2013-08-19 22:52:23 +01:00
Zuhayr
e3780520ee
Tiny Diona language fix.
2013-08-19 19:02:40 -07:00
Zuhayr
06cc5bc593
Compile fix, gah.
2013-08-19 18:56:32 -07:00
Zuhayr
e138ff4a4b
Name fix for diona.
2013-08-19 17:23:22 -07:00
Zuhayr
a697567806
Added abilities for nymphs/evolution to a final form.
2013-08-19 17:22:23 -07:00
Zuhayr
323fa2fe9c
Reapplying carbon changes to borers, accidentally overwrote 'em.
2013-08-19 16:25:13 -07:00
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
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
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
e05976e1b9
Confirmation prompt for borers.
2013-08-19 11:53:03 -07: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
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
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
Mloc-Argent
e809be825e
Merge branch 'master' into dev
...
Conflicts:
code/modules/mob/say.dm
2013-08-16 22:22:42 +01: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
