cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 7 Branches 0 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

3323 Commits

Author SHA1 Message Date
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
Zuhayr
2bc8212d2a Fix for subtypes of X mob not being able to understand each other. 2013-08-16 19:00:08 -07:00
Zuhayr
24a09bc9df Possible fix for deadchat runtime. 2013-08-16 01:45:50 -07:00
Zuhayr
9e58d93fd6 Removing snowflake checks for Soghun. 2013-08-16 01:01:12 -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
Lethal Ghost
5c958fe6b6 Remove useless code 2013-08-15 13:17:06 +06: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
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
Lethal Ghost
68e9e5d924 Very very old bug. 
From Russia with love
 2013-08-13 23:31:55 +06:00