mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 23:48:28 +01:00
Adds more descriptions to missing items and changes some (#24584)
* jesus fuck thats a lot of descs * Apply suggestions from code review Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * review * christa review * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> --------- Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
This commit is contained in:
co-authored by
CRUNCH
Henri215
Charlie Nolan
parent
b75bfd0e52
commit
34ba019704
@@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(gas_meters)
|
||||
|
||||
/obj/machinery/atmospherics/meter
|
||||
name = "gas flow meter"
|
||||
desc = "A gas flow meter"
|
||||
desc = "A meter used by experienced atmospheric technicians to determine pressure and temperature in a pipe."
|
||||
icon = 'icons/obj/meter.dmi'
|
||||
icon_state = "meterX"
|
||||
layer = GAS_PIPE_VISIBLE_LAYER + GAS_PUMP_OFFSET
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/obj/item/clothing/mask/gas
|
||||
name = "gas mask"
|
||||
desc = "A face-covering mask that can be connected to an air supply."
|
||||
desc = "A face-covering mask that can be connected to an air supply. Used by mischievous assistants and syndicate agents alike."
|
||||
icon_state = "gas_alt"
|
||||
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
|
||||
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
/obj/item/eftpos/register
|
||||
name = "point of sale"
|
||||
desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, and had an EFTPOS module fitted in it."
|
||||
desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, and had an EFTPOS module fitted in it. Swipe your ID card to make purchases electronically."
|
||||
icon = 'icons/obj/machines/pos.dmi'
|
||||
icon_state = "pos"
|
||||
force = 10
|
||||
|
||||
@@ -286,6 +286,7 @@
|
||||
item_state = "carton"
|
||||
throwforce = 0
|
||||
is_glass = FALSE
|
||||
gender = PLURAL
|
||||
list_reagents = list("orangejuice" = 100)
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/cream
|
||||
@@ -295,6 +296,7 @@
|
||||
item_state = "carton"
|
||||
throwforce = 0
|
||||
is_glass = FALSE
|
||||
gender = PLURAL
|
||||
list_reagents = list("cream" = 100)
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/tomatojuice
|
||||
@@ -304,6 +306,7 @@
|
||||
item_state = "carton"
|
||||
throwforce = 0
|
||||
is_glass = FALSE
|
||||
gender = PLURAL
|
||||
list_reagents = list("tomatojuice" = 100)
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/limejuice
|
||||
@@ -313,6 +316,7 @@
|
||||
item_state = "carton"
|
||||
throwforce = 0
|
||||
is_glass = FALSE
|
||||
gender = PLURAL
|
||||
list_reagents = list("limejuice" = 100)
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/milk
|
||||
@@ -322,6 +326,7 @@
|
||||
item_state = "carton"
|
||||
throwforce = 0
|
||||
is_glass = FALSE
|
||||
gender = PLURAL
|
||||
list_reagents = list("milk" = 100)
|
||||
|
||||
////////////////////////// MOLOTOV ///////////////////////
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#define GIBBER_ANIMATION_DELAY 16
|
||||
/obj/machinery/gibber
|
||||
name = "Gibber"
|
||||
name = "\improper Gibber"
|
||||
desc = "The name isn't descriptive enough?"
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
icon_state = "grinder"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/obj/machinery/processor
|
||||
name = "Food Processor"
|
||||
name = "\improper Food Processor"
|
||||
desc = "Used for turning ingredients into other ingredients."
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
icon_state = "processor"
|
||||
layer = 2.9
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
/obj/machinery/computer/library
|
||||
name = "Library Computer"
|
||||
desc = "Used by dusty librarians for their dusty books."
|
||||
icon = 'icons/obj/computer.dmi'
|
||||
icon_state = "oldcomp"
|
||||
icon_screen = "library"
|
||||
|
||||
@@ -159,6 +159,7 @@
|
||||
*/
|
||||
/obj/machinery/bookbinder
|
||||
name = "Book Binder"
|
||||
desc = "Used by authors, poets, and librarians to scan papers and print copies of their fanfics."
|
||||
icon = 'icons/obj/library.dmi'
|
||||
icon_state = "binder"
|
||||
anchored = TRUE
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/*****************Pickaxes & Drills & Shovels****************/
|
||||
/obj/item/pickaxe
|
||||
name = "pickaxe"
|
||||
desc = "A tool for digging rock and stone. Better get to work."
|
||||
icon = 'icons/obj/mining_tool.dmi'
|
||||
icon_state = "pickaxe"
|
||||
flags = CONDUCT
|
||||
|
||||
@@ -7,6 +7,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine
|
||||
name = "fax machine"
|
||||
desc = "Because just talking to your coworkers is too efficient."
|
||||
icon = 'icons/obj/library.dmi'
|
||||
icon_state = "fax"
|
||||
insert_anim = "faxsend"
|
||||
@@ -59,6 +60,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/longrange
|
||||
name = "long range fax machine"
|
||||
desc = "A fax machine of the ancient days, now using modern entanglement networks, all the better to snitch on your coworkers."
|
||||
fax_network = "Central Command Quantum Entanglement Network"
|
||||
long_range_enabled = TRUE
|
||||
|
||||
@@ -68,6 +70,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
|
||||
|
||||
/obj/machinery/photocopier/faxmachine/longrange/syndie
|
||||
name = "syndicate long range fax machine"
|
||||
desc = "For requesting supplies from your benefactors, not that they'll send you any."
|
||||
emagged = TRUE
|
||||
syndie_restricted = TRUE
|
||||
req_one_access = list(ACCESS_SYNDICATE)
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
/obj/structure/filingcabinet
|
||||
name = "filing cabinet"
|
||||
desc = "A large cabinet with drawers."
|
||||
desc = "A large cabinet with drawers for holding only the finest papers, photos, and folders."
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "filingcabinet"
|
||||
density = TRUE
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/obj/item/folder
|
||||
name = "folder"
|
||||
desc = "A folder."
|
||||
desc = "A folder for keeping all your important papers and photos."
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "folder"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
@@ -14,19 +14,19 @@
|
||||
A.emp_act(severity)
|
||||
|
||||
/obj/item/folder/blue
|
||||
desc = "A blue folder."
|
||||
desc = "A blue folder for keeping all the blueprints of your great ideas."
|
||||
icon_state = "folder_blue"
|
||||
|
||||
/obj/item/folder/red
|
||||
desc = "A red folder."
|
||||
desc = "A red folder for storing all the documents you've \"acquired\"."
|
||||
icon_state = "folder_red"
|
||||
|
||||
/obj/item/folder/yellow
|
||||
desc = "A yellow folder."
|
||||
desc = "A yellow folder for keeping all your very important court forms."
|
||||
icon_state = "folder_yellow"
|
||||
|
||||
/obj/item/folder/white
|
||||
desc = "A white folder."
|
||||
desc = "A white folder for holding medical records, if anyone ever prints any."
|
||||
icon_state = "folder_white"
|
||||
|
||||
/obj/item/folder/update_overlays()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/obj/item/paper_bin
|
||||
name = "paper bin"
|
||||
desc = "The second-most important part of bureaucracy, after the pen of course."
|
||||
icon = 'icons/obj/bureaucracy.dmi'
|
||||
icon_state = "paper_bin1"
|
||||
item_state = "sheet-metal"
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
/obj/machinery/photocopier
|
||||
name = "photocopier"
|
||||
desc = "For making copies of important documents, or more likely, your ass."
|
||||
icon = 'icons/obj/library.dmi'
|
||||
icon_state = "bigscanner"
|
||||
|
||||
@@ -579,6 +580,7 @@
|
||||
|
||||
/obj/item/toner
|
||||
name = "toner cartridge"
|
||||
desc = "Has 140 papers worth of ink in it! Shame you can only use 30 before it runs out of cyan..."
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon_state = "tonercartridge"
|
||||
var/toner_amount = 30
|
||||
|
||||
@@ -164,10 +164,9 @@
|
||||
*/
|
||||
/obj/machinery/light
|
||||
name = "light fixture"
|
||||
desc = "Industrial-grade light fixture for brightening up dark corners of the station."
|
||||
icon = 'icons/obj/lighting.dmi'
|
||||
var/base_state = "tube" // Base description and icon_state
|
||||
icon_state = "tube1"
|
||||
desc = "A lighting fixture."
|
||||
anchored = TRUE
|
||||
layer = 5
|
||||
max_integrity = 100
|
||||
@@ -175,6 +174,7 @@
|
||||
idle_power_consumption = 2 //when in low power mode
|
||||
active_power_consumption = 20 //when in full power mode
|
||||
power_channel = PW_CHANNEL_LIGHTING //Lights are calc'd via area so they dont need to be in the machine list
|
||||
var/base_state = "tube" // Base description and icon_state
|
||||
/// Is the light on or off?
|
||||
var/on = FALSE
|
||||
/// Is the light currently turning on?
|
||||
@@ -231,12 +231,12 @@
|
||||
*/
|
||||
/obj/machinery/light/small
|
||||
icon_state = "bulb1"
|
||||
base_state = "bulb"
|
||||
desc = "A compact and cheap light fixture, perfect for keeping maintenance tunnels appropriately spooky."
|
||||
fitting = "bulb"
|
||||
base_state = "bulb"
|
||||
brightness_range = 4
|
||||
brightness_color = "#a0a080"
|
||||
nightshift_light_range = 4
|
||||
desc = "A small lighting fixture."
|
||||
light_type = /obj/item/light/bulb
|
||||
|
||||
/obj/machinery/light/spot
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/obj/machinery/chem_dispenser
|
||||
name = "chem dispenser"
|
||||
desc = "For making chemicals, medicine, and explosions."
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
/obj/machinery/chem_master
|
||||
name = "\improper ChemMaster 3000"
|
||||
desc = "Used to turn reagents into pills, patches, and store them in bottles."
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
@@ -608,6 +609,7 @@
|
||||
|
||||
/obj/machinery/chem_master/condimaster
|
||||
name = "\improper CondiMaster 3000"
|
||||
desc = "Used to remove reagents from that single beaker you're using, or create condiment packs and bottles; your choice."
|
||||
condi = TRUE
|
||||
|
||||
/obj/machinery/chem_master/condimaster/Initialize(mapload)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/obj/machinery/reagentgrinder
|
||||
name = "\improper All-In-One Grinder"
|
||||
desc = "A chef's 9th most powerful weapon, right after the grill. Used for grinding items into reagents."
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
icon_state = "juicer1"
|
||||
layer = 2.9
|
||||
|
||||
@@ -290,8 +290,8 @@
|
||||
list_reagents = list("methamphetamine" = 10)
|
||||
|
||||
/obj/item/reagent_containers/glass/bucket
|
||||
desc = "It's a bucket."
|
||||
name = "bucket"
|
||||
desc = "Useful for moving liquids, or having a helmet in the zombie apocalypse."
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
icon_state = "bucket"
|
||||
item_state = "bucket"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
/obj/machinery/disposal
|
||||
name = "disposal unit"
|
||||
desc = "A pneumatic waste disposal unit. Alt-click to manually eject its contents."
|
||||
desc = "A pneumatic waste disposal unit, or a basketball hoop if you're bored. Alt-click to manually eject its contents."
|
||||
icon = 'icons/obj/pipes/disposal.dmi'
|
||||
icon_state = "disposal"
|
||||
anchored = TRUE
|
||||
|
||||
Reference in New Issue
Block a user