Ikarrus 6cc17a6243 Resolved Conflicts: ...

code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-06-27 00:17:02 -06:00

..

grenades

Squashed Commits

2015-06-27 00:09:16 -06:00

implants

Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…"

2015-06-26 02:44:20 +03:00

melee

Makes the game compile in byond version 508

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

storage

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

tanks

Destructible Clothing [WIP]

2015-06-25 00:06:47 -06: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

now less retarded

2015-06-24 23:24:59 +02:00

chrono_eraser.dm

TED and Chronosuit tweaks

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

cigs_lighters.dm

replaced icon with image

2015-06-14 17:49:45 +10:00

clown_items.dm

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

cosmetics.dm

Fixes runtime with do_after()'s that don't use a target.

2015-06-25 19:05:23 +02:00

courtroom.dm

Squashed Commits

2015-06-27 00:09:16 -06: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

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

2015-06-23 12:54:26 -07:00

extinguisher.dm

Destructible Clothing [WIP]

2015-06-25 00:06:47 -06:00

flamethrower.dm

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

gift_wrappaper.dm

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

handcuffs.dm

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

2015-06-22 22:57:53 -05: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

Squashed Commits

2015-06-27 00:09:16 -06:00

paint.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

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 branch 'master' of https://github.com/tgstation/-tg-station into graphics

2015-06-23 12:54:26 -07:00

RPD.dm

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

2015-06-23 12:54:26 -07:00

RSF.dm

More visible.message span classes removed.

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

scrolls.dm

Squashed Commits

2015-06-27 00:09:16 -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

Squashed Commits

2015-06-27 00:09:16 -06: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

Squashed Commits

2015-06-27 00:09:16 -06:00