Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds/Changes various machine descriptions #3774

Merged
merged 5 commits into from
Jul 7, 2023
Merged

Adds/Changes various machine descriptions #3774

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65e3908
Adds/Changes various machine descriptions
theselfish Jun 30, 2023
5456075
Update chem_dispenser.dm
theselfish Jun 30, 2023
c65856c
Update code/game/machinery/cryo.dm
theselfish Jul 6, 2023
bb4a42e
Update code/modules/shuttle/computers/dropship_computer.dm
theselfish Jul 6, 2023
789542b
Update code/game/machinery/vending/vendor_types/medical.dm
theselfish Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/machinery/cryo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

/obj/structure/machinery/cryo_cell
name = "cryo cell"
desc = "A donation from the old A.W project, using cryogenic technology, it slowly heals whomever is inside the tube."
theselfish marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/structures/machinery/cryogenics2.dmi'
icon_state = "cell"
density = FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@

/obj/structure/machinery/cm_vending/sorted/medical/blood
name = "\improper MM Blood Dispenser"
desc = "Marine Med brand Blood Pack Dispensary"
desc = "The Marine Med Brand Blood Pack Dispensary is the premier, top of the line blood dispenser of 2105! Get yours today!" //Don't update this year, the joke is it's old.
theselfish marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "blood"
wrenchable = TRUE
hackable = TRUE
Expand Down
1 change: 1 addition & 0 deletions code/modules/cm_tech/implements/railgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords)

/obj/effect/landmark/railgun_computer
name = "Railgun computer landmark"
desc = "A computer with an orange interface, it's idly blinking, awaiting a password."

/obj/effect/landmark/railgun_computer/Initialize(mapload, ...)
. = ..()
Expand Down
3 changes: 2 additions & 1 deletion code/modules/reagents/chemistry_machinery/chem_dispenser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/obj/structure/machinery/chem_dispenser
name = "chem dispenser"
name = "chemical dispenser"
desc = "A complex machine for mixing elements into chemicals. A Wey-Yu product."
density = TRUE
anchored = TRUE
icon = 'icons/obj/structures/machinery/science_machines.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/computers/dropship_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/structure/machinery/computer/shuttle/dropship/flight
name = "dropship navigation computer"
desc = "flight computer for dropship"
desc = "A flight computer than can be used for autopilot or long range flights."
theselfish marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/obj/structures/machinery/shuttle-parts.dmi'
icon_state = "console"
req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
Expand Down