zerothebigboy 1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum ...

# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi

2021-06-09 17:40:28 -04:00

..

bloodsucker

Merge pull request #14376 from Putnam3145/mode-chaos

2021-03-10 14:02:11 -07:00

brother

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

changeling

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

clock_cult

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

clown_ops

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

cult

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

devil

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

dynamic

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

2021-05-02 22:47:39 -04:00

eldritch_cult

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

extended

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

gangs

Merge remote-tracking branch 'origin/master' into perlin-genny

2021-03-20 20:36:56 +08:00

meteor

lowers cat meteor threat and makes them use the cat meteor sprite

2021-05-27 12:20:54 -04:00

monkey

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

nuclear

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

overthrow

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

revolution

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

sandbox

TGUI updates + statpanel

2020-09-02 17:52:47 +03:00

traitor

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

wizard

Added a "desired mode chaos" system

2021-03-07 20:14:11 -08:00

events.dm

The Mapping Update

2021-03-12 12:11:35 +08:00

game_mode.dm

fix

2021-03-20 12:13:28 -07:00

objective_items.dm

a

2020-07-26 06:29:10 -04:00

objective_sabotage.dm

Removed cloning destroy; removed commented-out objs (#14539)

2021-04-02 19:48:55 +02:00

objective.dm

Activity tracking; traitor class tweaks

2021-04-13 06:42:32 -07:00