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

..

__HELPERS

Improved creature AI and random mob spawning in caves.

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

_onclick

Quick fix from /tg/ for cyborgs.

2014-02-15 15:36:26 -05:00

ATMOSPHERICS

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

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

controllers

Outright removed toggle admin jump,spawn and revive buttons

2014-01-31 02:47:04 -05:00

datums

Merge pull request #158 from SamCroswell/master

2014-02-15 12:39:49 -05:00

defines

Reverted Astar fail-update

2014-01-31 02:29:01 -05:00

FEA

…

game

Jay Owen demands that this pull be merged.

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

js

…

modules

Jay Owen demands that this pull be merged.

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

TriDimension

…

unused

…

WorkInProgress

Comm console is now NanoUI. Fixes github #489, hopefully.

2014-02-15 15:33:45 -05:00

ZAS

…

ZAS - vg

…

global.dm

Comm console is now NanoUI. Fixes github #489, hopefully.

2014-02-15 15:33:45 -05:00

hub.dm

…

names.dm

…

setup.dm

Improved creature AI and random mob spawning in caves.

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

stylesheet.dm

Revert "New fonts work first iteration"

2014-02-04 02:47:14 -05:00

world.dm

Re-implementation

2014-02-08 23:47:06 -05:00