shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32249

Browse Source
This commit is contained in:
deathride58
2017-12-04 23:15:38 +00:00
committed by GitHub
parent 7e1bd55f7c 858a9bf428
commit 379f73d1e1
112 changed files with 1764 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/showcase.dm
+4 -4
View File
@@ -40,14 +40,14 @@
icon_state = "pod_g"
/obj/structure/showcase/machinery/oldpod
name = "damaged cyrogenic pod"
desc = "A damaged cyrogenic pod long since lost to time, including its former occupant..."
name = "damaged cryogenic pod"
desc = "A damaged cryogenic pod long since lost to time, including its former occupant..."
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper-open"
/obj/structure/showcase/machinery/oldpod/used
name = "opened cyrogenic pod"
desc = "Cyrogenic pod that has recently discharged its occupand. The pod appears non-functional."
name = "opened cryogenic pod"
desc = "A cryogenic pod that has recently discharged its occupant. The pod appears non-functional."
/obj/structure/showcase/cyborg/old
name = "Cyborg Statue"
code/game/objects/structures/statues.dm
+2 -2
View File
@@ -177,8 +177,8 @@
else
return ..()
/obj/structure/statue/plasma/proc/PlasmaBurn()
atmos_spawn_air("plasma=400;TEMP=1000")
/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature)
atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]")
deconstruct(FALSE)
/obj/structure/statue/plasma/proc/ignite(exposed_temperature)