mwerezak ec59f8ab07 Fixes captain's laser gun ...

Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.

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

..

admin

Merged with dev.

2015-02-24 17:03:39 +10:30

alarm

Restores silicon alarm notices.

2015-02-23 21:29:00 +01:00

assembly

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Merge pull request #8179 from comma/undies

2015-02-20 17:01:25 +10:30

clothing

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

2015-02-24 20:15:18 -05:00

customitems

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

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

detectivework

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

economy

…

events

Merge with dev.

2015-02-05 20:24:06 +10:30

examine

Fixes some misc examine bugs.

2015-02-24 07:42:06 -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

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

hydroponics

Resolves remaining issues with xenohydro PR.

2015-02-24 17:55:39 +10:30

icon generation

…

library

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

…

mining

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

mob

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

2015-02-24 20:15:18 -05:00

nano

Alarm centralization completion

2015-02-23 15:11:13 +01:00

organs

Merged with dev.

2015-02-24 17:03:39 +10:30

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro

2015-02-15 22:03:17 +10:30

power

Alarm centralization completion

2015-02-23 11:23:23 +01:00

projectiles

Fixes captain's laser gun

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

random_map

Merge with dev.

2015-02-05 20:24:06 +10:30

reagents

Resolves remaining issues with xenohydro PR.

2015-02-24 17:55:39 +10:30

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Fixes captain's laser gun

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

scripting

…

security levels

…

shieldgen

…

shuttles

…

supermatter

Changed supermatter engine manual for thermoelectric engine.

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

surgery

Surgery now shows up on mob, in all gory glory.

2015-02-21 16:31:44 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00