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

Shit catches on fire now

Browse Source 
Conflicts:
	code/ZAS/Fire.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/modules/mob/living/living_defines.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photography.dm
	code/setup.dm
This commit is contained in:
Rob Nelson
2014-07-18 02:03:51 -07:00
committed by ZomgPonies
parent dd31f75ae3
commit f7b516a5ab
17 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/fullwindow.dm
-6
View File
@@ -56,10 +56,6 @@
shardtype = /obj/item/weapon/shard/plasma
health = 120
/obj/structure/window/full/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 32000)
hit(round(exposed_volume / 1000), 0)
..()
/obj/structure/window/full/plasmareinforced
name = "reinforced plasma window"
@@ -70,8 +66,6 @@
reinf = 1
health = 160
/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/structure/window/full/reinforced
name = "reinforced window"