mwerezak 91d7dd7049 Adjusts item_state placeholders ...

Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.

2015-03-09 15:39:24 -04:00

..

admin

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

awaymissions

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

2015-03-05 08:05:44 +01:00

client

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

clothing

Adds four mercenary vests to the merc base, tweaks

2015-03-09 03:15:45 -04:00

customitems

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

2015-02-22 21:13:20 -05:00

detectivework

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

economy

…

events

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

examine

Adds help text and some antag text to common weapons. Makes chameleon gun change proc play nice with multiple definitions. Rest of chameleon stuff will be changed later when I get around to it.

2015-03-06 23:40:50 -05:00

ext_scripts

…

flufftext

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

food

Removing unused and now uncompilable distillery code.

2015-02-21 22:37:53 +10:30

games

…

genetics

…

holodeck

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

hydroponics

Fixes and adjustments

2015-03-04 11:18:40 -05:00

icon generation

…

library

…

liquid

…

maps

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

2015-03-05 08:05:44 +01:00

mining

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

mob

Fixing compile issues, adjusted buckle code after a weird merge.

2015-03-07 11:52:14 +10:30

nano

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

organs

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

overmap

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

2015-02-27 09:06:48 +01:00

paperwork

Fixes #8322.

2015-03-01 15:21:15 +01:00

power

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

2015-02-27 09:06:48 +01:00

projectiles

Adjusts item_state placeholders

2015-03-09 15:39:24 -04:00

random_map

…

reagents

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

2015-02-28 17:04:22 +10:30

recycling

…

research

Merge pull request #8288 from mwerezak/topicfix

2015-02-26 16:28:56 +10:30

scripting

…

security levels

…

shieldgen

…

shuttles

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

supermatter

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

surgery

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

2015-03-05 08:05:44 +01:00

vehicles

…

virus2

Master into dev-freeze.

2015-03-07 11:33:39 +10:30