Jordan BrownandCitadelStationBot 12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes ...

Adds traits for a character's preference towards pineapples.

2018-04-30 13:02:05 -05:00

..

__DEFINES

Merge pull request #37513 from ShizCalev/pineapple-memes

2018-04-30 13:02:05 -05:00

__HELPERS

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

_globalvars

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

_js

…

_onclick

Condenses a check

2018-04-29 10:03:39 -05:00

controllers

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

datums

Merge pull request #37513 from ShizCalev/pineapple-memes

2018-04-30 13:02:05 -05:00

game

Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577

2018-04-30 11:06:19 -05:00

modules

Merge pull request #37513 from ShizCalev/pineapple-memes

2018-04-30 13:02:05 -05:00

_compile_options.dm

Merge pull request #37000 from tgstation/KorPhaeron-patch-2

2018-04-11 15:12:55 -05:00

world.dm

…