PsiOmega 52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2014-12-09 17:55:14 +01:00

..

grenades

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

implants

Implantcase cleanup

2014-12-06 16:20:16 +13:00

melee

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +10:30

storage

Noise emotes

2014-12-07 12:09:02 +00:00

tanks

Changed helmet lights over to a general system/overlays.

2014-11-16 13:40:13 +10:30

AI_modules.dm

Fix infinite loop in freeform AI module

2014-06-25 23:09:21 +04:00

candle.dm

Changes candle.dm procs to absolute paths

2014-08-31 19:48:34 -07:00

cards_ids.dm

Changed helmet lights over to a general system/overlays.

2014-11-16 13:40:13 +10:30

cigs_lighters.dm

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

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

clown_items.dm

integrate XGM into the code

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

cosmetics.dm

Custom loadout updates

2014-11-01 15:56:11 -04:00

dice.dm

Adds sharp and edge flags to appropriate items

2014-06-16 13:26:44 -04:00

dna_injector.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

explosives.dm

Plastique wiring.

2014-11-24 11:21:31 +01:00

extinguisher.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

flamethrower.dm

integrate XGM into the code

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

game_kit.dm

…

gift_wrappaper.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

handcuffs.dm

Fixes bad handcuff check

2014-11-01 17:02:54 -04:00

hydroponics.dm

Hydroponics refactor, part 1: Files.

2014-06-11 03:44:29 +01:00

kitchen.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

manuals.dm

Changed phrasing about pressure with full oxygen internals as suggested by mwerezak.

2014-10-29 01:49:28 -04:00

mop.dm

Solves a runtime when someone tries to mop up blood.

2014-11-22 03:02:40 -05:00

paint.dm

Nextgen lighting #2: Lights

2014-06-18 20:38:33 +04:00

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

Fixes #7316

2014-12-10 00:56:26 +10:30

RSF.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

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

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

stunbaton.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

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

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

syndie.dm

…

table_rack_parts.dm

Merg resolution.

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

tape.dm

Tape fixes

2014-12-09 22:53:49 +13:00

teleportation.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

tools.dm

Added combi-tool.

2014-11-19 23:04:09 +10:30

twohanded.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

weaponry.dm

Reapplied ERT path changes, fixed compile error.

2014-11-14 23:09:44 +10:30

wires.dm

…