Unknown ec19a66eff Conflict Resolution

2019-03-27 16:36:41 -04:00

..

apc_damage.dm

…

atmos_leak.dm

Merge pull request #5343 from ReddeyfishVor/slimeChanges

2018-06-11 14:11:28 -04:00

blob.dm

…

brand_intelligence.dm

[5654] Makes this PR Compile

2019-02-23 12:30:16 -05:00

camera_damage.dm

…

canister_leak.dm

…

carp_migration.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

comms_blackout.dm

…

communications_blackout.dm

…

dust.dm

Add \the when practical

2018-05-02 08:58:07 +10:00

electrical_storm.dm

…

electrified_door.dm

Add moderate requirement for electrify

2018-04-14 10:37:58 -07:00

escaped_slimes.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

event_container_vr.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

event_container.dm

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04:00

event_dynamic.dm

…

event_manager.dm

Conflict Resolution

2019-03-27 16:36:41 -04:00

event.dm

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

gravity.dm

Move planets to SSplanets

2018-06-15 19:05:38 -04:00

grid_check.dm

…

grubinfestation_vr.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

ian_storm_vr.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

infestation.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

ion_storm.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

meteor_strike_vr.dm

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

meteors.dm

Merge pull request #5215 from Lorwp/eventmsg

2018-05-02 21:55:23 -05:00

money_hacker.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

money_lotto.dm

…

money_spam.dm

…

prison_break.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

radiation_storm.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

random_antagonist.dm

…

rogue_drones.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

shipping_error.dm

Refactors supply controller.

2018-07-31 19:11:02 -07:00

solar_storm.dm

Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed

2018-12-03 20:21:17 -05:00

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

spontaneous_appendicitis_vr.dm

…

spontaneous_appendicitis.dm

…

supply_demand.dm

Conflict Resolution

2019-03-27 16:36:41 -04:00

viral_infection.dm

Add \the when practical

2018-05-02 08:58:07 +10:00

viral_outbreak.dm

…

wallrot.dm

Add \the when practical

2018-05-02 08:58:07 +10:00

window_break.dm

Add several new events

2018-04-13 18:03:42 -07:00

wormholes.dm

Add several new events

2018-04-13 18:03:42 -07:00