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
a3f5e7ebfd3151cc5c228080789953b128ff019d
Bubberstation/code/game/objects/items
History
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
..
devices
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
robot
fixed compile errors
2014-12-24 21:03:22 -08:00
stacks
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
2014-12-04 12:45:31 -06:00
weapons
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
apc_frame.dm
…
blueprints.dm
SubSystem rewrite
2014-12-31 13:25:41 +00:00
bodybag.dm
…
candle.dm
SubSystem rewrite
2014-12-31 13:25:41 +00:00
crayons.dm
…
documents.dm
…
latexballoon.dm
Ok now explosions shall work properly
2014-12-05 23:21:48 +03:00
shooting_range.dm
…
toys.dm
Merge pull request #6573 from paprka/fixescaps
2014-12-27 18:14:28 +01:00
trash.dm
…