mwerezak cb2f68f81e Merge remote-tracking branch 'upstream/dev' into power-net

2014-08-03 01:50:51 -04:00

..

admin

Replaces antag intro text and objective announcement with a proc.

2014-07-30 21:36:31 +09:30

assembly

integrate XGM into the code

2014-07-22 19:52:12 +01:00

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

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

2014-07-28 20:59:29 +09:30

clothing

Merge pull request #5834 from Zuhayr/hydroponics

2014-08-01 15:01:52 +01:00

customitems

Adds Raptor1628's hazard hardsuit

2014-07-31 10:44:34 +03:00

destilery

…

detectivework

Fixed issue with recognizing covered jumpsuit and gloves

2014-07-26 17:07:34 -07:00

economy

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

events

Added Calamity mode.

2014-07-30 21:09:25 +09:30

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-10 22:20:13 +01:00

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

Adjusted gas exude code.

2014-07-30 20:54:36 +09:30

icon generation

…

library

…

liquid

…

maps

…

mining

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-27 03:20:16 +09:30

mob

Merge pull request #5862 from mwerezak/stun-baton

2014-08-03 12:59:54 +09:30

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

fixes nullpointer caused by broken organ list

2014-07-26 11:54:32 +02:00

paperwork

Merge branch 'dev' into Pics

2014-07-29 16:45:55 +02:00

power

Fixes NOPOWER not updating when machines are moved

2014-07-28 18:52:13 -04:00

projectiles

Bevy of newhydro fixes.

2014-07-29 00:20:38 +09:30

reagents

Changed hydro trays, fertilizer and syringes over to use the reagent procs.

2014-07-30 12:24:03 +09:30

recycling

Pipe rendering rewrite

2014-07-18 13:39:39 +00:00

research

Removes telecomm and RD server temperature cap

2014-07-28 20:24:17 -04:00

scripting

…

security levels

…

shuttles

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

supermatter

Merge remote-tracking branch 'upstream/dev' into power-net

2014-07-24 16:04:41 -04:00

surgery

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

2014-07-16 19:32:00 +09:30

vehicles

More train fixes

2014-07-28 20:39:42 +12:00

virus2

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

2014-07-16 19:30:41 +09:30