Ikarrus e811eac22e Resolve Conflicts: ...

icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-04-22 08:14:05 -06:00

..

devices

- Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round

2015-04-22 08:08:13 -06:00

robot

Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade.

2015-03-12 23:26:02 -04:00

stacks

Fixes fulltile windows not spawning the correct amounts of shards and rods.

2015-04-11 17:41:09 +02:00

weapons

Resolve Conflicts:

2015-04-22 08:14:05 -06:00

apc_frame.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

blueprints.dm

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

body_egg.dm

- Makes body_egg parent for alien embryos/changeling eggs

2015-03-24 17:54:20 +01:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

crayons.dm

Gang Mode Update 4

2015-04-21 23:23:15 -06:00

dehy_carp.dm

Fixed code, carp won't attack owner, corrected spelling.

2015-04-11 03:48:08 +01:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

holotape.dm

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

2015-02-24 22:16:53 +00:00

latexballoon.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

shooting_range.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

toys.dm

Gang Mode Update 4

2015-04-21 23:23:15 -06:00

trash.dm

Fixes trash disappearing when washed in a sink.

2015-03-03 00:07:08 +01:00