Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

apc_damage.dm

…

blob.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

brand_intelligence.dm

Text macro added on request of PsiOmegaDelta.

2015-12-21 04:25:59 -05:00

camera_damage.dm

…

carp_migration.dm

Replaced mobs with vore versions.

2016-06-03 22:57:51 -04:00

comms_blackout.dm

…

communications_blackout.dm

Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches.

2015-12-14 15:43:53 -05:00

dust.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

electrical_storm.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

event_container.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

event_dynamic.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

event_manager.dm

more time proc call fixes

2016-07-30 17:39:47 -04:00

event.dm

…

gravity.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

grid_check.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

ian_storm_vr.dm

IAN STORM

2016-05-27 13:30:33 -04:00

infestation.dm

Neither Travis nor Byond noticed this. Whoops!

2016-06-09 01:37:54 -04:00

ion_storm.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

meteors.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00

money_hacker.dm

world time fix

2016-07-30 03:19:47 -04:00

money_lotto.dm

world time fix

2016-07-30 03:19:47 -04:00

money_spam.dm

Generic Station & System Name

2016-05-16 16:21:17 -04:00

prison_break.dm

world time fix

2016-07-30 03:19:47 -04:00

radiation_storm.dm

Dorms protect vs radiation for lewds

2016-06-14 00:40:11 -04:00

random_antagonist.dm

…

rogue_drones.dm

Fixes grammar error

2016-07-16 21:29:02 -05:00

solar_storm.dm

Polaris fix

2016-07-10 04:15:32 +01:00

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

Removes the old virus system

2016-01-27 11:44:41 +03:00

viral_infection.dm

Antags are now never eligible to be patient zero.

2015-08-22 14:38:08 +02:00

viral_outbreak.dm

…

wallrot.dm

Tweaks event text to fit with the lore better.

2015-12-21 04:01:05 -05:00