LetterJay a64dba6270 Merge branch 'flagcape' ...

# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm

2018-07-06 00:51:42 -05:00

..

admin

Adds @CitadelBot wheelofsalt command (#7005)

2018-06-05 11:15:51 -07:00

antagonists

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

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

arousal

Corrects climax cooldown timer message, makes relieve message pronounsensitive (#7086)

2018-06-13 19:27:19 -07:00

cargo

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

client

Merge branch 'flagcape'

2018-07-06 00:51:42 -05:00

clothing

adds "cap's female formal outfit" (#7307)

2018-07-04 05:37:01 -07:00

crafting

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

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

custom_loadout

Merge branch 'flagcape'

2018-07-06 00:51:42 -05:00

events

modularize

2018-06-14 15:35:25 -07:00

food_and_drinks/snacks

Filet-O-Adisa

2018-03-05 06:51:48 -06:00

jobs

[MIRROR] HoP/QM have access to vault (#6818)

2018-05-27 17:25:18 -07:00

keybindings

Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)

2018-04-27 07:41:31 -07:00

mentor

Update mentor.dm

2018-07-03 06:33:33 -07:00

mining

modularizes mining shuttle console id lock

2018-01-04 13:17:40 -05:00

mob

makes it compile. should work. hopefully

2018-07-02 15:35:11 -04:00

power

makes lighting a little fancier (#5576)

2018-02-18 19:26:15 -06:00

projectiles

rubberoo

2018-06-23 14:48:00 +02:00

reagents

makes it compile. should work. hopefully

2018-07-02 15:35:11 -04:00

recycling/disposal

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

research

rubber2

2018-06-23 15:06:36 +02:00

uplink

Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)

2018-05-27 17:18:40 -07:00

vore

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

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