Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00

Files

Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()

Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm

2014-08-31 13:40:16 +02:00

ammunition

Advanced Shotshells

2014-08-14 12:15:10 -05:00

guns

Tidying presentation

2014-08-27 21:07:52 +02:00

projectile

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

2014-08-31 13:40:16 +02:00

ammunition.dm

Fix wands losing a charge even when no shot was actually fired (#4588 ).