Zuhayr 7f2ec91e54 Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak ...

Uplink cost tweaking.

2015-12-02 09:56:07 +10:30

..

circuitboards

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-11-02 09:25:04 +01:00

grenades

Overhauls humanoid vision handling.

2015-10-05 08:48:47 +02:00

implants

Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak

2015-12-02 09:56:07 +10:30

material

Added boot knives and putting a knife in your boot.

2015-12-01 02:05:29 +10:30

melee

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

storage

Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak

2015-12-02 09:56:07 +10:30

tanks

Oxygen tanks now have a visual indicator of their pressure on the item icon.

2015-11-20 19:36:33 +10:30

AI_modules.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

autopsy.dm

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

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

candle.dm

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

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

cards_ids_syndicate.dm

Adds Syndicate ID sprite

2015-09-20 21:11:49 +02:00

cards_ids.dm

Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source

2015-09-09 02:58:07 -04:00

cigs_lighters.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-14 08:34:42 +02:00

clown_items.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

cosmetics.dm

Merge with dev-freeze.

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

dice.dm

…

dna_injector.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

explosives.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

extinguisher.dm

Makes fire extinguishers effective at putting out mob fires

2015-06-21 00:43:15 -04:00

flamethrower.dm

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

game_kit.dm

…

gift_wrappaper.dm

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

handcuffs.dm

Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly).

2015-12-01 02:04:10 +10:30

hydroponics.dm

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

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

improvised_components.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

kitchen.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

manuals.dm

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

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

mop.dm

Fixes #10548

2015-08-12 12:21:28 -04:00

paint.dm

Fixes #10645

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

paiwire.dm

…

policetape.dm

Police tape rewrite

2015-10-22 14:31:04 +02:00

power_cells.dm

More merge conflict resolution.

2015-09-13 21:12:14 -05:00

RCD.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

RSF.dm

…

scrolls.dm

Merge with dev-freeze.

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

shields.dm

Glowy items.

2015-09-20 18:18:19 +02:00

stunbaton.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

surgery_limbattachment.dm

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

2015-06-02 20:18:45 +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.

2015-09-09 15:15:43 -04:00

syndie.dm

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

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

tape.dm

You can now pull your punches when engaging in unarmed combat.

2015-12-01 02:04:39 +10:30

teleportation.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

tools.dm

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

traps.dm

Removes bear traps from the custodial closet, adds autolathe recipe

2015-08-22 02:31:19 -04:00

trays.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

weaponry.dm

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

2015-10-15 07:08:16 -04:00

weldbackpack.dm

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

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

wires.dm

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

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