cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,739 Commits 8 Branches 26 Tags
5cddea72f083996c8fb3699aa7eaef28a6d408ae
Commit Graph

3489 Commits

Author SHA1 Message Date
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Zuhayr
906768070f Resolved custom_items.dmi. 2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Zuhayr
d3d6294ab0 Compile fix, ugh. 2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286 Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob. 2014-01-10 01:58:22 +10:30
Zuhayr
35d8219bb6 Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine. 2014-01-09 23:57:20 +10:30
Zuhayr
943554242a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-09 23:53:34 +10:30
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
ZomgPonies
09c56a0930 BS12 compile fixes for Constructs 2014-01-09 04:49:16 -05:00
ZomgPonies
b4f401e3b6 Constructs missing all their abilities -- Taken from /tg/ 
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
 2014-01-09 04:40:37 -05:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143
 2014-01-08 22:15:47 -07:00
Chinsky
3259ccf86f Merge pull request #4217 from DJSnapshot/dev 
Custom stuffs!
 2014-01-08 17:22:29 -08:00
Giacomand
dfdeed7434 Made the follow verb less buggy. 
Removed duplicated code.
 2014-01-08 19:14:15 +00:00
Zuhayr
a040cb8f08 Commit testing? What's that? Single character fix for pulse checking. 2014-01-08 21:07:10 +10:30
Zuhayr
787da649c1 Safer way to do the alien thang. 2014-01-08 11:05:58 +10:30
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
DJSnapshot
39c04e06f0 Fix so that custom sprited borgs don't spawn as a cardborg 2014-01-06 12:50:30 -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