Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

apc_damage.dm

…

atmos_leak.dm

Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases

2020-08-27 22:28:46 -04:00

aurora_caelus.dm

Update aurora_caelus.dm

2020-06-16 08:36:44 -04:00

blob.dm

…

brand_intelligence.dm

…

camera_damage.dm

Port TGUI Wire datums (ParadiseSS13/Paradise#13769)

2020-07-22 00:23:58 -07:00

canister_leak.dm

…

carp_migration.dm

…

comms_blackout.dm

…

communications_blackout.dm

…

drone_pod_vr.dm

…

dust.dm

…

electrical_storm.dm

…

electrified_door.dm

…

escaped_slimes.dm

…

event_container_vr.dm

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

2020-08-09 02:58:18 -07:00

event_container.dm

Disables Aurora Caelus event

2020-07-15 03:28:08 -04:00

event_dynamic.dm

…

event_manager.dm

…

event.dm

…

gravity_vr.dm

…

gravity.dm

…

grid_check.dm

…

grubinfestation_vr.dm

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

2020-08-09 02:58:18 -07:00

ian_storm_vr.dm

…

infestation.dm

Fix hangar locations

2020-07-16 20:04:31 -07:00

ion_storm.dm

Site Management lookover for _vr stuff

2020-08-29 05:22:52 +10:00

maintenance_predator_vr.dm

…

meteor_strike_vr.dm

…

meteors.dm

…

money_hacker.dm

…

money_lotto.dm

…

money_spam.dm

TGUI PDAs Finale (minus newscaster)

2020-09-16 21:31:50 -07:00

morph_spawn_vr.dm

…

mutants.dm

Fix Hangar Locations

2020-07-16 20:03:28 -07:00

prison_break.dm

…

radiation_storm.dm

…

random_antagonist.dm

…

rogue_drones.dm

…

shipping_error.dm

…

solar_storm.dm

Merge pull request #7298 from TheFurryFeline/TFF-Solar_Storm_Typo_Fixy

2020-06-22 15:16:48 -04:00

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spider_migration_yw.dm

Update spider_migration_yw.dm

2020-08-05 23:41:34 -04:00

spontaneous_appendicitis_vr.dm

…

spontaneous_appendicitis.dm

…

supply_demand_vr.dm

TGUI NTOS - Total Conversion

2020-09-05 17:02:58 -07:00

viral_infection.dm

…

viral_outbreak.dm

…

wallrot.dm

…

window_break.dm

…

wormholes.dm

…