Round Two

This commit is contained in:
Shadow
2020-01-11 11:53:07 -06:00
parent 6088899908
commit 46d7ca5d31
15 changed files with 21 additions and 6 deletions

View File

@@ -20,7 +20,7 @@ Thus, the two variables affect pump operation are set in New():
level = 1
name = "gas pump"
desc = "A pump"
desc = "A pump that moves gas from one place to another."
var/target_pressure = ONE_ATMOSPHERE

View File

@@ -6,7 +6,7 @@
level = 1
name = "high power gas pump"
desc = "A pump. Has double the power rating of the standard gas pump."
desc = "A pump that moves gas from one place to another. Has double the power rating of the standard gas pump."
power_rating = 15000 //15000 W ~ 20 HP

View File

@@ -3,6 +3,7 @@
//--------------------------------------------
/obj/machinery/atmospherics/omni/atmos_filter
name = "omni gas filter"
desc = "An advanced version of the gas filter, able to be configured for filtering of multiple gasses."
icon_state = "map_filter"
pipe_state = "omni_filter"

View File

@@ -7,6 +7,7 @@
level = 1
name = "Gas filter"
desc = "Filters one type of gas from an input, and pushes it out the side."
use_power = 1
idle_power_usage = 150 //internal circuitry, friction losses and stuff

View File

@@ -140,6 +140,7 @@
// Heat Exchange Junction - Interfaces HE pipes to normal pipes
//
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
desc = "An adaptor to transfer gasses between regular pipes and heat transferring ones. It doesn't conduct heat all that well."
icon = 'icons/atmos/junction.dmi'
icon_state = "intact"
pipe_icon = "hejunction"

View File

@@ -1,5 +1,6 @@
/obj/machinery/sleep_console
name = "sleeper console"
desc = "A control panel to operate a linked sleeper with."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeperconsole"
var/obj/machinery/sleeper/sleeper

View File

@@ -2,6 +2,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
name = "Gas Sensor"
desc = "Senses atmospheric conditions."
anchored = 1
var/state = 0

View File

@@ -233,7 +233,10 @@
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary
name = "Stationary Air Scrubber"
desc = "[initial(desc)] This one seems to be tightly secured with large bolts."
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize()
. = ..()
desc += "This one seems to be tightly secured with large bolts."
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(I.is_wrench())

View File

@@ -1,5 +1,6 @@
/obj/machinery/pipedispenser
name = "Pipe Dispenser"
desc = "A large machine that can rapidly dispense pipes."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "pipe_d"
density = 1
@@ -105,6 +106,7 @@
/obj/machinery/pipedispenser/disposal
name = "Disposal Pipe Dispenser"
desc = "A large machine that can rapidly dispense pipes. This one seems to dispsense disposal pipes."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "pipe_d"
density = 1

View File

@@ -6,6 +6,7 @@
icon = 'icons/obj/food.dmi'
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard

View File

@@ -116,6 +116,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
// It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it. // Nov 2019. Nope.
/obj/machinery/librarycomp
name = "Check-In/Out Computer"
desc = "Print books from the archives! (You aren't quite sure how they're printed by it, though.)"
icon = 'icons/obj/library.dmi'
icon_state = "computer"
anchored = 1
@@ -520,6 +521,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
*/
/obj/machinery/bookbinder
name = "Book Binder"
desc = "Ties up a sheaf or paper into a nice book format."
icon = 'icons/obj/library.dmi'
icon_state = "binder"
anchored = 1

View File

@@ -25,9 +25,9 @@
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
RefreshParts()
/obj/machinery/photocopier/examine()
/obj/machinery/photocopier/examine(mob/user as mob)
if(..(user, 1))
to_chat(user, "The screen shows there's [toner ? [toner] : no] toner left in the printer.")
to_chat(user, "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer.")
/obj/machinery/photocopier/attack_ai(mob/user as mob)
return attack_hand(user)

View File

@@ -83,7 +83,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/examine(mob/user, distance, infix, suffix)
if(..())
to_chat(user, "It appears to be [active ? online : offline].")
to_chat(user, "It appears to be [active ? "online" : "offline"].")
/obj/machinery/message_server/proc/GenerateKey()

View File

@@ -93,6 +93,7 @@
// Panel. Lists floors (HTML), moves with the elevator, schedules a move to a given floor.
/obj/structure/lift/panel
name = "elevator control panel"
desc = "A control panel for moving the elevator. There's a slot for swiping IDs to enable additional controls."
icon_state = "panel"

View File

@@ -26,6 +26,7 @@
/obj/vehicle/train/trolley
name = "cargo train trolley"
desc = "A large, flat platform made for putting things on. Or people."
icon = 'icons/obj/vehicles.dmi'
icon_state = "cargo_trailer"
anchored = 0