cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-26 06:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #240 from skull132/development

Browse Source 
Update 22AUG2014
This commit is contained in:
skull132
2014-08-22 22:56:43 +03:00
parent d442af3df6 881d211161
commit 239bddb189
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/dna_modifier.dm
+4 -4
View File
@@ -401,7 +401,7 @@
occupantData["structuralEnzymes"] = null
occupantData["radiationLevel"] = null
else
occupantData["name"] = connected.occupant.name
occupantData["name"] = connected.occupant.real_name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
if (NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
@@ -704,7 +704,7 @@
databuf.types = DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name
databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Unique Identifier"
src.buffers[bufferId] = databuf
return 1
@@ -715,7 +715,7 @@
databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name
databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Unique Identifier + Unique Enzymes"
src.buffers[bufferId] = databuf
return 1
@@ -726,7 +726,7 @@
databuf.types = DNA2_BUF_SE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name
databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Structural Enzymes"
src.buffers[bufferId] = databuf
return 1
code/game/objects/items/weapons/extinguisher.dm
+1
View File
@@ -127,6 +127,7 @@
M.ExtinguishMob()
if(W.loc == my_target) break
sleep(2)
W.delete()
if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
user.inertia_dir = get_dir(target, user)
code/game/objects/structures/window.dm
+1 -1
View File
@@ -388,7 +388,7 @@
shardtype = /obj/item/weapon/shard/plasma
health = 120
/obj/structure/window/phoronbasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/structure/window/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 32000)
hit(round(exposed_volume / 1000), 0)
..()
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -461,4 +461,4 @@
return
/obj/item/weapon/paper/crumpled/bloody
icon_state = "scrap_bloodied"
icon_state = "scrap_bloodied"
maps/tgstation2.dmm
+2 -2
View File
@@ -4232,7 +4232,7 @@
"bDt" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/medical/sleeper)
"bDu" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/medical/medbay2)
"bDv" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/obj/item/weapon/reagent_containers/spray,/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
"bDw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
"bDw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/melee/defibrillator,/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
"bDx" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/medical/medbay2)
"bDy" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bDz" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera{c_tag = "Cloning Lab"; dir = 1; network = list("SS13","Medical")},/obj/machinery/dna_scannernew,/turf/simulated/floor{dir = 10; icon_state = "whiteblue"},/area/medical/genetics_cloning)
@@ -4844,7 +4844,7 @@
"bPh" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/weapon/hand_labeler,/obj/item/weapon/gun/syringe,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPi" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPj" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/rxglasses,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 1; network = list("SS13","Medical"); pixel_x = 22},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPk" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = -1; pixel_y = -1; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPk" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = -1; pixel_y = -1; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/melee/defibrillator,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPl" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
nano/templates/pda.tmpl
+2 -2
View File
@@ -380,10 +380,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{:~string('<span class="{0}">{1}%</span>', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}}
</div>
<div class="itemLabel">
Phoron:
Plasma:
</div>
<div class = "itemContent">
{{:~string('<span class="{0}">{1}%</span>', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}}
{{:~string('<span class="{0}">{1}%</span>', aircontents.plasma > 0 ? 'bad' : 'good' , aircontents.plasma)}}
</div>
{{if aircontents.other > 0}}