Remie Richards 2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

2014-11-08 01:07:29 +00:00

..

holiday

Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.

2014-10-31 19:48:55 +01:00

wizard

Fix for #5247

2014-10-15 11:35:53 +02:00

alien_infestation.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

anomaly_bluespace.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix

2014-10-22 20:54:35 +02:00

anomaly_flux.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix

2014-10-22 20:54:35 +02:00

anomaly_grav.dm

Anomaly Event Changes

2014-10-19 17:07:07 -05:00

anomaly_pyro.dm

Also fixing the end() proc for pyroplastic anomaly.

2014-10-22 21:00:38 +02:00

anomaly_vortex.dm

Anomaly Event Changes

2014-10-19 17:07:07 -05:00

anomaly.dm

Anomaly Event Changes

2014-10-19 17:07:07 -05:00

blob.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

brand_intelligence.dm

Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type

2014-07-12 20:03:46 -07:00

carp_migration.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal

2014-10-25 11:29:07 +00:00

communications_blackout.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

disease_outbreak.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

dust.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

electrical_storm.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

event_manager.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

event.dm

Allows wizard events to be forced outside of summon events (and normal events to be forced within summon events)

2014-09-12 19:00:02 -04:00

false_alarm.dm

Fixes false alarm event runtime caused by an uninitialized list

2014-10-12 21:04:21 +02:00

immovable_rod.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix

2014-09-25 18:45:53 +02:00

ion_storm.dm

Merge pull request #4524 from Ikarrus/eventsprompter

2014-08-30 20:12:46 +01:00

mass_hallucination.dm

…

meateor_wave.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

meteor_wave.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

ninja.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework

2014-11-08 01:07:29 +00:00

prison_break.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

radiation_storm.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

shuttle_loan.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

spacevine.dm

adding diagonal attack animation.

2014-11-07 15:42:07 +01:00

spider_infestation.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

spontaneous_appendicitis.dm

…

vent_clog.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

weightless.dm

Trigger Events verb will now ask if the admin wants to announce to the crew

2014-08-21 21:33:53 -06:00

wormholes.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00