Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

holiday

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

wizard

Merge pull request #6387 from Incoming5643/goodbye_my_children

2014-12-26 16:29:36 -06:00

alien_infestation.dm

Pipenet revamp

2014-11-03 08:21:31 -03: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

Simple fix for brand intellegense runtime

2014-11-22 20:09:19 +03: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

Added datum mutations

2014-12-12 04:48:11 +03: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

Ion strings moved to external txt. Credits to volundr @ goonstation for the idea and the contents of _string_lists.dm

2014-11-13 19:59:20 -03: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

* Fixes meteors infinigibs and infinisplosions (#5226)

2014-11-08 14:43:48 +01:00

ninja.dm

Fixed conflicts

2014-12-23 05:39:39 +03:00

prison_break.dm

…

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

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

2014-11-09 00:15:12 +11:00

spacevine.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

spider_infestation.dm

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

spontaneous_appendicitis.dm

Makes data huds passive.

2014-11-16 01:52:06 -03:00

vent_clog.dm

Pipenet revamp

2014-11-03 08:21:31 -03: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

…