Ikarrus e27cdc7efe Resolved Conflicts: ...

code/game/gamemodes/gang/dominator.dm

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

..

grenades

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

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

implants

Merge pull request #10004 from Ikarrus/gangimplants

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

melee

Makes the game compile in byond version 508

2015-06-09 04:14:12 -07:00

storage

Removed unnecessary spaces in these situations:

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

tanks

Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen

2015-05-04 00:19:18 -05:00

AI_modules.dm

zeroth laws can be removed with core boards

2015-05-28 19:38:06 +10:00

airlock_painter.dm

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

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

cards_ids.dm

Centcom Response Team Variations

2015-04-27 01:08:47 -06:00

chrono_eraser.dm

TED and Chronosuit tweaks

2015-04-26 02:59:11 -04:00

cigs_lighters.dm

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

2015-05-20 01:16:16 +10:00

clown_items.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

cosmetics.dm

span fixes

2015-04-24 20:52:01 +03:00

courtroom.dm

warning span for gavel

2015-03-24 22:53:11 -04:00

defib.dm

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

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

dice.dm

upgrades the HARDFEET species flag to PIERCEIMMUNE

2015-05-31 18:54:30 -04:00

dna_injector.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

explosives.dm

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

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

extinguisher.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

flamethrower.dm

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

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

gift_wrappaper.dm

Gang Update: Fashion War Edition

2015-06-18 20:01:57 -06:00

handcuffs.dm

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

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

janisigns.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

kitchen.dm

Fork eating no longer requires mouth zone sel

2015-05-07 15:13:06 +12:00

manuals.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

mop.dm

Merge pull request #9355 from Firecage/OverlaycleanBGone

2015-05-09 21:30:21 +10:00

paint.dm

…

paiwire.dm

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

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

pneumaticCannon.dm

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

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

RCD.dm

Merge pull request #9960 from xxalpha/bass

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

RPD.dm

cleanup of various unused/useless things

2015-05-27 18:12:12 -06:00

RSF.dm

More visible.message span classes removed.

2015-04-24 21:24:21 +03:00

scrolls.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

shields.dm

Simplifies laser reflection code, no more reflect_chance var at the obj/item level.

2015-03-09 12:28:35 +01:00

signs.dm

- Adds delay to picket signs

2015-04-08 16:21:19 +02:00

singularityhammer.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

stunbaton.dm

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

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

teleportation.dm

Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.

2014-12-15 00:08:03 +01:00

tools.dm

Merge pull request #9804 from Firecage/Exwelder

2015-06-07 21:23:45 -05:00

twohanded.dm

Merge pull request #9401 from Firecage/ofgibtonite

2015-06-17 15:12:10 +02:00

vending_items.dm

Fixes Autodrobe not having any contraband/deluxe items in stock. Adding a warning to prevent future bug.

2015-04-26 19:23:22 +02:00

weaponry.dm

Removed unnecessary spaces in these situations:

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