Ccomp5950 83ef93c41c Merge pull request #4270 from Baystation12/master ...

Merge master into Dev

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

..

admin

Merge pull request #4265 from SkyMarshal/heatfix

2014-01-10 18:47:53 -08: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

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

client

Mixed up some whitelist flags.

2014-01-07 20:53:42 +10:30

clothing

Merge pull request #4252 from RKF45/ears

2014-01-10 13:47:10 -08: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

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

library

Added two new manuals by MagmaRam to the default engineering manual bookcase.

2013-10-27 18:25:25 -04:00

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

Fix for mining.

2014-01-09 17:26:13 -07:00

mob

Merge pull request #4270 from Baystation12/master

2014-01-11 18:18:03 -08: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

Using dev-freeze map.

2013-12-27 10:42:13 +10:30

projectiles

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

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

reagents

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2014-01-09 17:42:30 +00: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

Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.

2013-11-07 16:02:57 -08:00

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