cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
This commit is contained in:
phil235
2016-04-26 21:49:51 +02:00
committed by phil235
parent b7da04e8c8 2bc85f6e9e
commit 6eb4ffa825
85 changed files with 1093 additions and 5082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+1
View File
@@ -20,6 +20,7 @@
body_parts_covered = HEAD
burn_state = FLAMMABLE
burntime = 5
dog_fashion = /datum/dog_fashion/head
var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF