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

..

achievements

…

actions

…

brain_damage

…

components

Merge pull request #14637 from TheObserver-sys/DerringerPass1

2021-05-07 18:42:24 -06:00

diseases

viro symptom typo fix (#14600)

2021-04-12 18:39:24 +02:00

elements

Activity tracking; traitor class tweaks

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

helper_datums

fixes

2021-05-10 17:44:21 +02:00

looping_sounds

…

mapgen

…

martial

abuse

2021-05-24 21:40:15 -04:00

materials

Merge branch 'master' into Plasmaispogtake2

2021-03-25 10:44:12 -04:00

mood_events

…

mutations

Fixes some stuff

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

ruins

…

skills

…

status_effects

Merge branch 'master' into baton_change_pr

2021-04-19 10:55:33 +10:00

traits

…

weather

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

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

wires

…

wounds

…

accents.dm

…

action.dm

…

ai_laws.dm

…

armor.dm

…

beam.dm

…

beepsky_fashion.dm

…

browser.dm

…

callback.dm

…

chatmessage.dm

upload files

2021-06-08 13:13:22 -03:00

cinematic.dm

…

dash_weapon.dm

…

datacore.dm

…

datum.dm

…

datumvars.dm

…

dna.dm

upload files

2021-04-22 20:39:21 -03:00

dog_fashion.dm

…

ductnet.dm

…

emotes.dm

…

ert.dm

…

explosion2.dm

deterministic explosion system (#13392)

2021-05-12 05:44:53 -05:00

explosion.dm

Made threat a subsystem instead of dynamic-attached.

2021-03-24 23:44:37 -07:00

forced_movement.dm

…

holocall.dm

…

http.dm

…

hud.dm

…

mind.dm

…

mutable_appearance.dm

…

numbered_display.dm

renders storage objects independently per user (#14545)

2021-04-13 15:16:21 +02:00

outfit.dm

upload files

2021-04-22 20:39:21 -03:00

position_point_vector.dm

…

profiling.dm

…

progressbar.dm

…

radiation_wave.dm

…

recipe.dm

…

ruins.dm

…

saymode.dm

…

shuttles.dm

…

soullink.dm

…

spawners_menu.dm

…

tgs_event_handler.dm

…

verbs.dm

…

view.dm

…

weakrefs.dm

…

world_topic.dm

…