Commit Graph

3470 Commits

Author SHA1 Message Date
Zuhayr
c8b595be95 Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions. 2014-01-08 10:27:21 +10:30
Zuhayr
1faf2ef25b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-08 09:42:47 +10:30
Zuhayr
a039f05372 Merge pull request #4224 from Ccomp5950/bug_fixes
Bug fixes
2014-01-07 02:36:51 -08:00
Zuhayr
3b072b32b0 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically. 2014-01-06 14:54:35 +10:30
Zuhayr
b28592d707 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-06 13:42:23 +10:30
Ccomp5950
cd4ef7a1b7 Ghost chat unicode support...removed unneeded sanitize() 2014-01-05 19:30:52 -06:00
Zuhayr
d0ac6e6fff Forgot a var. 2014-01-06 00:15:55 +10:30
Zuhayr
22e325d6ec Implemented IS_SLOW. 2014-01-06 00:13:49 +10:30
Zuhayr
b70a79f853 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags. 2014-01-05 23:59:39 +10:30
Zuhayr
2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
Zuhayr
825f542011 Merge pull request #4206 from RKF45/fixes
Small fixes maybe?
2014-01-05 02:44:27 -08:00
Zuhayr
6fed0c70da Applying NO_BLOOD flag to bleeding code. 2014-01-05 14:06:51 +10:30
Zuhayr
28d8109136 Added NO_BLOOD and IS_SLOW to dionaea. 2014-01-05 13:48:49 +10:30
RKF45
9b2ff51486 Merge remote-tracking branch 'upstream/dev' 2014-01-04 19:41:19 +01:00
Fira
354b1978ea Partial fix for pAI emotes (they still can't hear beyond one container
level, will require a say/emote code hack)
2014-01-04 15:22:17 +01:00
Fira
ed5307abd0 Added Air Analyser verb for ghosts to spy on supermatter and atmos 2014-01-04 12:27:07 +01:00
Zuhayr
7005a66d5b Fix for containers getting left behind when nymphs grow. 2014-01-04 13:28:32 +10:30
Zuhayr
fa2b6fa6b4 Couple of oversights with diona. 2014-01-04 13:23:59 +10:30
Zuhayr
47dda54a72 Forgot SLOT_HEAD. 2014-01-04 12:53:51 +10:30
Zuhayr
f2300725f7 Made it possible to pick up and wear diona nymphs. 2014-01-04 12:49:55 +10:30
Zuhayr
122f5854d6 Fix for oversight of dionaea needing to breathe. 2014-01-04 12:49:15 +10:30
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Zuhayr
f679776a22 Made diona nymph evolution whitelisted. 2014-01-03 09:37:13 +10:30
RKF45
86334cbee2 I have no idea what I'm doing D: 2014-01-01 17:03:02 +01:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Zuhayr
df6bd5d6c8 Gib rewrite/resprite to allow for arbitrary blood and flesh colours. 2013-12-30 21:48:34 +10:30
Zuhayr
5313851da9 Converted robots over to current blood system/paths, updated various files to work with update. 2013-12-29 02:48:20 +10:30
Zuhayr
be14eb8781 Minor hand blood overlay fix. 2013-12-29 00:34:03 +10:30
Zuhayr
01dd4373d0 Minor bugfix with blood painting code. 2013-12-29 00:11:21 +10:30
Zuhayr
26de46ae4b Added ghost writing proc to mob/dead. 2013-12-28 23:59:47 +10:30
Zuhayr
c6c1a575d6 Merge of blood file, ammo icons, map. Manual binary file merge incoming. 2013-12-28 23:13:04 +10:30
Zuhayr
183afc61bf Reverts corgi dress-up due to being terrible and duplicating items. 2013-12-27 11:06:20 +10:30
Zuhayr
661593718f Using dev-freeze map. 2013-12-27 10:42:13 +10:30
Chinsky
3ee2430425 Made blood overlays respect blood color 2013-12-26 15:28:03 +04:00
Zuhayr
e89fe94af8 Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours. 2013-12-26 14:48:05 +10:30
Zuhayr
d97180239b Using chinsky's blood file. 2013-12-26 13:46:12 +10:30
Zuhayr
1311cf0300 Merge pull request #4117 from comma/bloodydoodle
Adds ability to write on floors and walls with blood.
2013-12-25 19:13:30 -08:00
Zuhayr
1888a4d956 Merge pull request #4116 from comma/showoff
Adds Show item verb
2013-12-25 19:13:21 -08:00
Zuhayr
d9a0f496c0 Removed debug strings/values. 2013-12-26 10:35:45 +10:30
Zuhayr
6b2bfbc38d Species-based blood colour support code. 2013-12-26 03:21:46 +10:30
Zuhayr
8b0f778a83 Mass updates to paths for blood decals. 2013-12-26 01:56:06 +10:30
Chinsky
d166d3c992 Merge pull request #4100 from Zuhayr/dev
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Chinsky
0c94d2892d Fixes #4071
Emote needed "me" action first, using custom_emote instead.
2013-12-25 14:44:50 +04:00
Chinsky
5071ea57ad Fix for #3583
Hostile mobs now check adjacency before applying damage.
2013-12-25 14:20:56 +04:00
Chinsky
ab727aef11 Added link to examine shown item.
Removed grab handler because it's an abstract item.
2013-12-25 02:44:42 +04:00
Chinsky
7d95a385f2 No messages from beyond the grave pls. 2013-12-25 01:59:35 +04:00
Chinsky
ac1c24f35c Adds ability to write on floors and walls with blood.
Codersprites for now.
2013-12-25 00:11:50 +04:00
Mloc
0ff0004250 Merge pull request #4112 from fauxki/dev
Sprite Bug Fixes
2013-12-23 15:36:02 -08:00
fauxki
28340d01ab #4108 - mispelling was preventing it from showing up. 2013-12-23 14:53:46 -08:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30