cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9066bc7c4f5fdc6dc1da4a976ced4d3aa1c4c975
Bubberstation/code/game/objects
History
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
..
effects
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
2016-01-13 20:07:21 -06:00
items
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
2016-01-13 20:07:21 -06:00
structures
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
2016-01-13 20:07:21 -06:00
buckling.dm
Fixes
2015-12-14 16:40:00 -06:00
empulse.dm
Pooling is good for the soul.
2015-11-17 11:27:26 -05:00
explosion.dm
fixes explosions
2016-01-03 17:42:04 -08:00
items.dm
Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
2015-12-29 14:26:48 -03:00
objs.dm
Merge pull request #14347 from Iamgoofball/patch-143
2016-01-06 12:22:05 -06:00
radiation.dm
Removes rad pulse admin notice
2015-12-10 04:26:56 -06:00
structures.dm
The blob eats nondense things in all cases.
2015-11-20 21:03:43 -05:00
weapons.dm
…