SinTwo f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm

2016-08-09 15:46:24 -04:00

..

circuitboards

Revert "Frame Cleanup"

2016-08-06 00:27:03 +01:00

grenades

Grenade Buff

2016-07-27 17:05:17 -07:00

implants

Fixes implants not receiving messages, converts them to absolute proc pathing.

2016-06-26 23:55:48 -04:00

material

Further weapon force tweaks

2016-08-07 15:00:25 +01:00

melee

item_state cleanup

2016-07-11 22:31:32 -04:00

storage

Merge branch 'master' into fuckCael

2016-08-08 18:41:18 +03:00

tanks

(hopefully) last name tweak

2016-07-25 19:50:19 -04:00

AI_modules.dm

…

autopsy.dm

more time proc call fixes

2016-07-30 17:39:47 -04:00

candle.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

cards_ids_syndicate.dm

…

cards_ids.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade

2016-07-27 16:11:55 -04:00

cigs_lighters.dm

Fixes lighters being able to ignite people while off.

2016-07-12 22:13:04 -05:00

clown_items.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

cosmetics.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

dice.dm

#MoreDice2016 (#2016)

2016-07-03 19:48:28 +01:00

dna_injector.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

explosives.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

extinguisher.dm

Further weapon force tweaks

2016-08-07 15:00:25 +01:00

flamethrower.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

game_kit.dm

…

gift_wrappaper.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

handcuffs.dm

Fixes

2016-07-02 21:25:38 -05:00

hydroponics.dm

…

improvised_components.dm

Lets spears be made from butterfly knifes as well as shards.

2016-06-07 19:42:11 +01:00

manuals.dm

…

mop_deploy.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

mop.dm

…

paint.dm

…

paiwire.dm

…

policetape.dm

Mapped tape rolls can now apply themselves.

2016-05-26 17:53:00 +01:00

power_cells.dm

…

RCD.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

RSF.dm

Ports GinjaNinja32's drinks rewrite from Bay

2016-06-06 20:33:11 +01:00

scrolls.dm

…

shields.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

stunbaton.dm

Corrects the way stunbatons check for charge on attack

2016-07-16 23:05:06 -05:00

surgery_tools.dm

…

swords_axes_etc.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

syndie.dm

Does some stuff

2016-07-27 05:11:12 +01:00

tape.dm

more item_state fixes: worn_state purge

2016-07-24 19:03:15 -04:00

teleportation.dm

…

tools.dm

no message

2016-08-07 01:39:55 +01:00

towels.dm

Adds towels to fitness vendor, color is randomised

2016-06-13 20:19:52 +01:00

traps.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

trays.dm

…

weaponry.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

weldbackpack.dm

…