cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into Pipes

Browse Source
This commit is contained in:
PsiOmega
2014-11-18 07:57:50 +01:00
parent 5bd25f8b85 ff665a2cb3
commit 080f568df2
4 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/presets.dm
+8 -3
View File
@@ -40,7 +40,7 @@
id = "Hub"
network = "tcommsat"
autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
"supply", "common", "command", "engineering", "security",
"supply", "service", "common", "command", "engineering", "security",
"receiverA", "receiverB", "broadcasterA", "broadcasterB")
/obj/machinery/telecomms/hub/preset_cent
@@ -95,7 +95,7 @@
id = "Bus 2"
network = "tcommsat"
freq_listening = list(SUP_FREQ, SRV_FREQ)
autolinkers = list("processor2", "supply")
autolinkers = list("processor2", "supply", "service")
/obj/machinery/telecomms/bus/preset_three
id = "Bus 3"
@@ -167,8 +167,13 @@
/obj/machinery/telecomms/server/presets/supply
id = "Supply Server"
freq_listening = list(SUP_FREQ, SRV_FREQ)
freq_listening = list(SUP_FREQ)
autolinkers = list("supply")
/obj/machinery/telecomms/server/presets/service
id = "Service Server"
freq_listening = list(SRV_FREQ)
autolinkers = list("service")
/obj/machinery/telecomms/server/presets/common
id = "Common Server"
code/modules/customitems/item_defines.dm
+1 -1
View File
@@ -358,7 +358,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1 //rukral:Nashida Bisha'ra
name = "Nashida's Etched Beaker"
desc = "The message: 'Please do not be removing this beaker from the chemistry lab. If lost, return to Nashida Bisha'ra' can be seen etched into the side of this 100 unit beaker."
desc = "The message: 'Please do not be removing this beaker from the chemistry lab. If lost, return to Nashida Bisha'ra' can be seen etched into the side of this large beaker."
icon = 'icons/obj/chemical.dmi'
icon_state = "beakerlarge"
matter = list("glass" = 5000)
code/modules/reagents/reagent_containers/glass.dm
+9 -5
View File
@@ -156,12 +156,16 @@
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
desc = "A beaker."
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
matter = list("glass" = 500)
New()
..()
desc += " Can hold up to [volume] units."
on_reagent_change()
update_icon()
@@ -202,7 +206,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
desc = "A large beaker."
icon_state = "beakerlarge"
matter = list("glass" = 5000)
volume = 120
@@ -212,7 +216,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 60 units."
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
matter = list("glass" = 500)
volume = 60
@@ -221,7 +225,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology. Can hold up to 300 units."
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
matter = list("glass" = 5000)
volume = 300
@@ -232,7 +236,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/vial
name = "vial"
desc = "A small glass vial. Can hold up to 25 units."
desc = "A small glass vial."
icon_state = "vial"
matter = list("glass" = 250)
volume = 30