cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 23:23:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

Browse Source 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Ravensdale
2014-04-16 21:44:26 -07:00
parent 1d6655850f 20e2991af3
commit 68eda5201b
51 changed files with 11267 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Ported/Bureaucracy/filing.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/structure/filingcabinet/attackby(obj/item/weapon/paper/P,mob/M)
if(istype(P))
M << "You put the [P] in the [src]."
M << "You put \the [P] in the [src]."
M.drop_item()
P.loc = src
else