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

..

holiday

…

wizard

…

_event.dm

…

abductor.dm

…

alien_infestation.dm

…

anomaly_bluespace.dm

…

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

anomaly.dm

…

aurora_caelus.dm

…

blob.dm

…

brain_trauma.dm

…

brand_intelligence.dm

…

bureaucratic_error.dm

…

camerafailure.dm

…

carp_migration.dm

…

cat_surgeon.dm

Fixed something with the event

2021-05-31 09:52:31 +02:00

cat_wave.dm

makes cat meteors significantly rarer than meaty ores

2021-05-27 12:17:41 -04:00

communications_blackout.dm

…

devil.dm

…

disease_outbreak.dm

…

dust.dm

…

electrical_storm.dm

…

fake_virus.dm

…

false_alarm.dm

…

floorcluwne.dm

Fixes some stuff

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

fugitive_spawning.dm

…

ghost_role.dm

…

grid_check.dm

…

heart_attack.dm

…

high_priority_bounty.dm

…

immovable_rod.dm

…

ion_storm.dm

…

major_dust.dm

…

mass_hallucination.dm

…

meateor_wave.dm

…

meteor_wave.dm

adds the cat wave_type

2021-05-27 00:25:55 -04:00

mice_migration.dm

…

nightmare.dm

…

operative.dm

…

pirates.dm

…

portal_storm.dm

…

prison_break.dm

…

processor_overload.dm

…

radiation_storm.dm

…

sentience.dm

…

shuttle_catastrophe

…

shuttle_loan.dm

…

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

…

stray_cargo.dm

…

supermatter_surge.dm

…

supernova.dm

…

travelling_trader.dm

…

vent_clog.dm

…

wisdomcow.dm

…

wormholes.dm

…