Jarcolr 2d51c24364 Adds 2 approved custom items to code ...

http://baystation12.net/forums/viewtopic.php?f=33&t=10561
http://baystation12.net/forums/viewtopic.php?f=33&t=10517
/obj/item/weapon/lighter/zippo/fluff/janis_godmanis
/obj/item/clothing/ears/fluff/qokkri

2014-06-07 10:46:11 +03:00

..

__HELPERS

Merge branch 'dev' into mutiny

2014-06-03 21:27:42 -05:00

_onclick

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

2014-05-16 18:11:11 -05:00

ATMOSPHERICS

Makes it so mixers and filters no longer block mob

2014-05-22 03:00:18 -07:00

controllers

Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.

2014-06-03 18:06:05 +09:30

datums

Merge resolution with master.

2014-06-02 12:05:12 +09:30

defines

Merge resolution with master.

2014-06-02 12:05:12 +09:30

FEA

…

game

Merge pull request #5162 from mwerezak/wheelchair

2014-06-07 13:36:30 +09:30

js

…

modules

Adds 2 approved custom items to code

2014-06-07 10:46:11 +03:00

TriDimension

…

unused

Merge resolution with master.

2014-06-02 12:05:12 +09:30

WorkInProgress

Merge resolution with master.

2014-06-02 12:05:12 +09:30

ZAS

Merge pull request #4986 from Intercross21/dev

2014-05-15 14:07:24 +09:30

global.dm

Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.

2014-06-03 18:06:05 +09:30

hub.dm

…

names.dm

…

setup.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30

stylesheet.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

world.dm

Merge pull request #4912 from Ccomp5950/mentors

2014-05-07 10:00:27 +09:30