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

..

area

Admin room revamp

2014-02-08 13:35:35 -05:00

dna

More DNA fixes.

2014-02-07 20:56:21 -05:00

gamemodes

Merge pull request #158 from SamCroswell/master

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

jobs

Fucking byond vars

2014-02-15 13:04:57 -05:00

machinery

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

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

magic

…

mecha

Heavy laser buff and new sniper projectile

2014-02-08 13:20:59 +01:00

objects

Jay Owen demands that this pull be merged.

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

structure

Adds snowmen, walruses and seals to clown planet.

2013-12-22 10:27:05 -05:00

turfs

Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash

2014-01-23 23:31:36 -05:00

vehicles

…

verbs

Forgot the eyemob receiving LOOC for the AI

2014-01-06 20:26:43 -05:00

asteroid.dm

New stuff for mining

2014-02-16 03:54:39 -05:00

atoms_movable.dm

SINGULOTH OPTIMIZATIONS - See full commit for details.

2014-01-31 02:34:39 -05:00

atoms.dm

Added chem handling and IED recipe

2014-01-31 02:56:27 -05:00

communications.dm

…

json.dm

…

mining_surprise.dm

New stuff for mining

2014-02-16 03:54:39 -05:00

response_team.dm

Ninja and DS Mass Driver fixes

2014-02-05 23:02:44 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

More fixes to text2speech

2014-01-27 16:58:52 -05:00

supplyshuttle.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