Incoming 917370a608 Jay Owen demands that this pull be merged. ...

Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi

2014-02-16 05:42:55 -05:00

..

devices

People in lobby won't see PDA messages.

2014-02-14 11:54:32 +01:00

robot

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

stacks

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

weapons

Improved creature AI and random mob spawning in caves.

2014-02-16 04:40:18 -05:00

apc_frame.dm

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

blueprints.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

bodybag.dm

This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).

2013-06-29 16:49:48 -04:00

candle.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

contraband.dm

Additional Drug Names

2014-01-23 19:26:32 -05:00

crayons.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

latexballoon.dm

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

shooting_range.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

toys.dm

/TG/ Cards Ported, new card deck added

2014-02-11 23:22:30 -05:00

trash.dm

Jay Owen demands that this pull be merged.

2014-02-16 05:42:55 -05:00