cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)

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

Conflicts:
	code/game/objects/items/weapons/explosives.dm
This commit is contained in:
MrPerson
2014-03-21 19:04:51 -07:00
parent 6930283efc ce13db149e
commit ee716586b9
18 changed files with 505 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_areas.dm
+1
View File
@@ -2,6 +2,7 @@
/area/mine
icon_state = "mining"
has_gravity = 1
/area/mine/explored
name = "Mine"