Ikarrus e27cdc7efe Resolved Conflicts: ...

code/game/gamemodes/gang/dominator.dm

2015-06-18 23:05:51 -06:00

..

admin

Merge pull request #9957 from MrStonedOne/boomboomshaketheroom

2015-06-17 14:17:09 +02:00

assembly

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

awaymissions

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

client

hotfix for character save compatibility with the features system (aka custom lizards)

2015-06-15 19:20:50 -04:00

clothing

Resolved Conflicts:

2015-06-18 23:05:51 -06:00

crafting

Adds feedback gathering for a hell of a lot more things.

2015-06-09 21:52:46 -07:00

detectivework

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

emoji

…

events

Fixes the wizard magic mirror race change.

2015-06-15 17:01:07 +02:00

flufftext

Minor fixes

2015-06-17 18:59:28 +02:00

food&drinks

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

holiday

…

hydroponics

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

library

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Righted some checks.

2015-06-17 21:03:11 +01:00

mob

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

nano

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

ninja

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

paperwork

Merge pull request #10004 from Ikarrus/gangimplants

2015-06-18 10:41:15 -05:00

power

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

procedural mapping

Updates paths

2015-06-03 22:52:39 +02:00

projectiles

Merge pull request #10004 from Ikarrus/gangimplants

2015-06-18 10:41:15 -05:00

reagents

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

recycling

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

research

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

scripting

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

security levels

…

shuttle

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00

surgery

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

telesci

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00