ikarrus e73586dadf Resolved Conflicts: ...

code/modules/security levels/keycard authentication.dm

2014-03-18 00:17:22 -06:00

..

admin

Merge pull request #3072 from Aranclanos/MaintDoors

2014-03-17 22:40:54 -05:00

assembly

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

awaymissions

Reworked arguments to suit new GetTypeInAllContents

2014-03-07 21:06:46 +00:00

client

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

clothing

-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old

2014-03-12 22:32:49 -06:00

detectivework

…

events

Added RPED, some sprites and new power cell path

2014-02-24 05:14:43 +04:00

flufftext

Fixes bullet_act not checking for damagetype on many, many objects.

2014-03-01 16:39:22 -08:00

food

By sticking a crayon in the mix when making a burger you can now make a colored burger!

2014-02-23 18:34:32 -05:00

hydroponics

Conflict fix

2014-03-05 06:30:29 +04:00

library

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

mining

Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes

2014-03-02 17:07:24 -08:00

mob

Merge pull request #3095 from Ikarrus/hopian

2014-03-17 23:56:16 -05:00

nano

…

paperwork

Merge pull request #2826 from YotaXP/polaroid-fix

2014-02-20 16:22:59 -08:00

power

Merge pull request #3064 from Rockdtben/removeTLEComments

2014-03-14 15:40:27 -05:00

projectiles

Merge pull request #3000 from Cheridan/3000

2014-03-10 23:21:34 -02:00

reagents

Merge pull request #3067 from Giacom/virus_food_mix

2014-03-17 09:02:45 -07:00

recycling

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

research

Conflict fix

2014-03-02 04:14:32 +04:00

scripting

…

security levels

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

shuttle

…

surgery

second pass

2014-02-15 20:11:12 -08:00

telesci

Stops window from getting higher than 800 px

2014-03-12 12:33:30 +01:00