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

2014-10-06 20:15:59 +10:30

..

grenades

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

implants

Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.

2014-09-30 14:09:41 +09:30

melee

…

storage

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

2014-10-06 20:15:59 +10:30

tanks

…

AI_modules.dm

…

candle.dm

…

cards_ids.dm

…

cigs_lighters.dm

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Stack update

2014-09-02 09:59:32 +04:00

hydroponics.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor).

2014-09-04 16:36:26 +02:00

paint.dm

…

paiwire.dm

…

power_cells.dm

APC cell_type is now an actual power cell type

2014-09-10 22:12:43 -04:00

RCD.dm

…

RSF.dm

…

scrolls.dm

…

shards.dm

Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens.

2014-09-30 15:28:30 +09:30

shields.dm

…

stunbaton.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

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

2014-09-29 06:19:26 +09:30

swords_axes_etc.dm

…

syndie.dm

…

table_rack_parts.dm

Merg resolution.

2014-10-02 02:33:06 +09:30

teleportation.dm

…

tools.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

twohanded.dm

…

weaponry.dm

…

wires.dm

…