CitadelStationBot eafb25535a [MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094) ...

* Adds a new drink: Peppermint Patty from Archer! (#38427)

* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too

* Adds a new drink: Peppermint Patty from Archer!

2018-06-15 02:46:40 -07:00

..

__DEFINES

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

__HELPERS

[MIRROR] Fixes flash_color (#7106)

2018-06-13 20:26:24 -07:00

_globalvars

Individual Logs now follow the client around automatically (#37790)

2018-06-06 04:10:20 -05:00

_js

…

_onclick

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

controllers

[MIRROR] Legacy config warning only happens if any legacy configs are present (#7089)

2018-06-15 02:43:15 -07:00

datums

[MIRROR] Fixes clothes getting damaged twice in explosions. (#7097)

2018-06-15 02:44:01 -07:00

game

[MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092)

2018-06-15 02:42:34 -07:00

modules

[MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094)

2018-06-15 02:46:40 -07:00

_compile_options.dm

…

world.dm

…