Arokha Sieyes eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync ...

# Conflicts:
#	vorestation.dme

2016-06-07 18:37:47 -04:00

..

circuitboards

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

grenades

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

implants

Small typo fix

2016-05-31 14:13:13 -04:00

material

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

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

melee

Reverts the second mob clean up because of incomplete implementation.

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

storage

Adds a missing (src)

2016-06-02 18:12:21 -04:00

tanks

Reverts the second mob clean up because of incomplete implementation.

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

AI_modules.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

autopsy.dm

Construction Update

2016-03-25 16:02:36 -04:00

candle.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

cards_ids_syndicate.dm

Syndicate id card now checks if the player mind an antag.

2015-12-10 10:55:55 +00:00

cards_ids.dm

Fixes CentCom IDs.

2016-06-01 23:06:10 -04:00

cigs_lighters.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04: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

Construction Update

2016-03-25 16:02:36 -04:00

dice.dm

…

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

Ports event system from Bay

2016-06-01 22:05:04 +01:00

flamethrower.dm

Construction Update

2016-03-25 16:02:36 -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

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

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

hydroponics.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

improvised_components.dm

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

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

manuals.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

mop_deploy.dm

Reverts the second mob clean up because of incomplete implementation.

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

mop.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

paint.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

paiwire.dm

…

policetape.dm

Mapped tape rolls can now apply themselves.

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

power_cells.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-24 18:16:36 +03:00

RCD.dm

Reverts the second mob clean up because of incomplete implementation.

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

RSF.dm

…

scrolls.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

shields.dm

Adds a bunch of stuff for sec armor. See PR for details.

2016-03-06 04:18:39 -05:00

stunbaton.dm

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

2016-05-29 01:00:50 +01:00

surgery_tools.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

swords_axes_etc.dm

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

syndie.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

tape.dm

Reverts the second mob clean up because of incomplete implementation.

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

teleportation.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

tools.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

towels.dm

Fixes towel hit sound

2016-05-26 16:48:25 +01:00

traps.dm

Reverts the second mob clean up because of incomplete implementation.

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

trays.dm

Slight optimization in dropped, adds colors to material items.

2016-01-14 18:29:49 -05:00

weaponry.dm

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

weldbackpack.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00