Ccomp5950 8ae4e41aaa Derp merge deconflict error I made when merging master into dev-freeze.

2014-01-23 01:36:32 -06:00

..

admin

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

assembly

Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.

2013-12-18 02:08:38 +08:00

awaymissions

…

client

SMES NanoUI

2014-01-12 01:28:03 +00:00

clothing

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

customitems

Replaces modwho and adminwho with staffwho.

2014-01-10 12:49:32 -08:00

destilery

Openable soda cans and beer bottles!

2013-12-31 17:52:12 -08:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

economy

Small fixes, again

2014-01-04 21:26:28 +01:00

events

PDA NanoUI spam event update.

2013-12-28 20:56:06 -06:00

ext_scripts

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

flufftext

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

food

Roasted diona, for ZomgPonies/Paradise.

2014-01-10 00:26:23 +10:30

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Plasma glass stacking fix

2014-01-11 18:14:51 +13:00

mob

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

nano

Minor fix for NanoUI

2014-01-09 01:06:24 +00:00

organs

More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

2014-01-06 14:54:35 +10:30

paperwork

Talisman icon fix

2014-01-10 17:09:01 -05:00

power

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00

projectiles

Merge of blood file, ammo icons, map. Manual binary file merge incoming.

2013-12-28 23:13:04 +10:30

reagents

Derp merge deconflict error I made when merging master into dev-freeze.

2014-01-23 01:36:32 -06:00

recycling

Converted robots over to current blood system/paths, updated various files to work with update.

2013-12-29 02:48:20 +10:30

research

Merge pull request #4270 from Baystation12/master

2014-01-11 18:18:03 -08:00

scripting

…

security levels

…

surgery

Manual binary merge of head icons.

2013-12-22 23:23:25 +10:30

telesci

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2013-12-13 19:13:43 +00:00

virus2

DNA2 - A recode of DNA

2013-12-01 00:04:27 -08:00