cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-05-23 19:04:09 +02:00
parent 2c5e216e82 b1acfe3c87
commit ef479cb982
49 changed files with 232 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+2 -2
View File
@@ -403,8 +403,8 @@
/obj/item/paper/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
if(burn_state >= FLAMMABLE) //Only render paper that's burnable to be hard to read.
info = "[stars(info)]"
if(burn_state >= FLAMMABLE) //Renders paper that has been lit on fire to be illegible.
info = "<i>Heat-curled corners and sooty words offer little insight. Whatever was once written on this page has been rendered illegible through fire.</i>"
/obj/item/paper/proc/stamp(var/obj/item/stamp/S)
stamps += (!stamps || stamps == "" ? "<HR>" : "") + "<img src=large_[S.icon_state].png>"