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

Merge branch 'bleeding-edge-freeze' into viro

Browse Source
This commit is contained in:
comma
2013-07-09 12:49:23 +04:00
parent 50f94ddd93 ae2a9c56ad
commit 1095bd1978
117 changed files with 2329 additions and 2264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/barsign.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/sign/barsign
/obj/effect/sign/double/barsign
icon = 'barsigns.dmi'
icon_state = "empty"
anchored = 1
code/game/objects/effects/spawners/bombspawner.dm
+4 -4
View File
@@ -137,12 +137,12 @@
OT.master = V
PT.air_contents.temperature = PLASMA_FLASHPOINT
PT.air_contents.toxins = 15
PT.air_contents.carbon_dioxide = 33
PT.air_contents.toxins = 3
PT.air_contents.carbon_dioxide = 17
PT.air_contents.update_values()
OT.air_contents.temperature = PLASMA_FLASHPOINT
OT.air_contents.oxygen = 48
OT.air_contents.oxygen = 20
OT.air_contents.update_values()
var/obj/item/device/assembly/S
@@ -171,4 +171,4 @@
V.update_icon()
del(src)
del(src)