diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 3df03bebde7..e6731d4ea17 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -10,7 +10,7 @@ name = "air vent" desc = "Has a valve and pump attached to it" use_power = 1 - + can_unwrench = 1 var/area/initial_loc @@ -68,7 +68,7 @@ ..() /obj/machinery/atmospherics/unary/vent_pump/high_volume - name = "Large Air Vent" + name = "large air vent" power_channel = EQUIP /obj/machinery/atmospherics/unary/vent_pump/high_volume/New() @@ -184,7 +184,7 @@ if(frequency != 1439) initial_loc.air_vent_info -= id_tag initial_loc.air_vent_names -= id_tag - name = "Vent Pump" + name = "vent pump" else broadcast_status() @@ -399,4 +399,3 @@ initial_loc.air_vent_info -= id_tag initial_loc.air_vent_names -= id_tag return ..() - \ No newline at end of file diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 41ce133403b..ae432ee7336 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -335,7 +335,7 @@ return 0 /obj/machinery/computer/scan_consolenew - name = "DNA Modifier Access Console" + name = "\improper DNA Modifier access console" desc = "Allows you to scan and modify DNA." icon = 'icons/obj/computer.dmi' icon_screen = "dna" diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 9662358a32f..53e49224c6c 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -1,7 +1,7 @@ /obj/machinery/bodyscanner var/mob/living/carbon/occupant var/locked - name = "Body Scanner" + name = "body scanner" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "bodyscanner-open" density = 1 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 17ee041e81b..54fd1edeaf3 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -1,5 +1,5 @@ /obj/machinery/ai_slipper - name = "AI Liquid Dispenser" + name = "\improper AI liquid dispenser" icon = 'icons/obj/device.dmi' icon_state = "motion3" layer = 3 diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index fbe43b8095b..97a99e7899d 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -1,7 +1,7 @@ obj/machinery/air_sensor icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" - name = "Gas Sensor" + name = "gas sensor" req_one_access_txt = "24;10" anchored = 1 diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 948de84f89f..0b1be444c7c 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/area_atmos - name = "Area Air Control" + name = "area air control" desc = "A computer used to control the stationary scrubbers and pumps in the area." icon_screen = "area_atmos" icon_keyboard = "atmos_key" diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm index 0a008eb819e..41540788bb7 100644 --- a/code/game/machinery/bees_items.dm +++ b/code/game/machinery/bees_items.dm @@ -29,7 +29,7 @@ /obj/item/weapon/bee_net/verb/empty_bees() set src in usr - set name = "Empty bee net" + set name = "empty bee net" set category = "Object" var/mob/living/carbon/M if(iscarbon(usr)) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index c91fa3a8597..f63f4e333c1 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -1,5 +1,5 @@ /obj/machinery/biogenerator - name = "Biogenerator" + name = "biogenerator" desc = "Converts plants into biomass, which can be used to construct useful items." icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-empty" diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index bd0da6f8fc2..6f0af9e4923 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/HolodeckControl - name = "Holodeck Control Computer" + name = "holodeck control computer" desc = "A computer used to control a nearby holodeck." icon_keyboard = "tech_key" icon_screen = "holocontrol" diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 1daf3be5714..f3e6de46321 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/operating - name = "Operating Computer" + name = "operating computer" density = 1 anchored = 1.0 icon_keyboard = "med_key" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index a95627913f0..74ea7609137 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/aifixer - name = "AI System Integrity Restorer" + name = "\improper AI system integrity restorer" icon = 'icons/obj/computer.dmi' icon_keyboard = "rd_key" icon_screen = "ai-fixer" diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 6cbd71cf35a..cecf755b37d 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -5,7 +5,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert - name = "Atmospheric Alert Computer" + name = "atmospheric alert computer" desc = "Used to access the station's atmospheric sensors." circuit = /obj/item/weapon/circuitboard/atmos_alert icon_keyboard = "atmos_key" diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 3c0b46e6813..197008c40f7 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -12,8 +12,8 @@ var/datum/nano_module/atmos_control/atmos_control /obj/machinery/computer/atmoscontrol/laptop - name = "Atmospherics Laptop" - desc = "Cheap Nanotrasen Laptop." + name = "atmospherics laptop" + desc = "Cheap Nanotrasen laptop." icon_state = "medlaptop" density = 0 diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index c70ac8d37cc..1e6c8c2f5a6 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -280,7 +280,7 @@ // Other computer monitors. /obj/machinery/computer/security/telescreen - name = "Telescreen" + name = "\improper Telescreen" desc = "Used for watching camera networks." icon = 'icons/obj/stationobjs.dmi' icon_state = "telescreen" @@ -295,7 +295,7 @@ return /obj/machinery/computer/security/telescreen/entertainment - name = "Entertainment Monitor" + name = "entertainment monitor" desc = "Damn, they better have Paradise TV on these things." icon = 'icons/obj/status_display.dmi' icon_state = "entertainment" @@ -305,7 +305,7 @@ luminosity = 0 /obj/machinery/computer/security/wooden_tv - name = "Security Camera Monitor" + name = "security camera monitor" desc = "An old TV hooked into the stations camera network." icon_state = "television" icon_keyboard = null @@ -315,7 +315,7 @@ network = list("SS13") /obj/machinery/computer/security/mining - name = "Outpost Camera Monitor" + name = "outpost camera monitor" desc = "Used to access the various cameras on the outpost." icon_keyboard = "mining_key" icon_screen = "mining" @@ -323,7 +323,7 @@ network = list("Mining Outpost") /obj/machinery/computer/security/engineering - name = "Engineering Camera Monitor" + name = "engineering camera monitor" desc = "Used to monitor fires and breaches." icon_keyboard = "power_key" icon_screen = "engie_cams" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 020969521a1..4e7dd4e28cf 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -3,7 +3,7 @@ var/time_last_changed_position = 0 /obj/machinery/computer/card - name = "Identification Computer" + name = "identification computer" desc = "Terminal for programming Nanotrasen employee ID cards to access parts of the station." icon_keyboard = "id_key" icon_screen = "id" @@ -428,6 +428,6 @@ var/time_last_changed_position = 0 return 1 /obj/machinery/computer/card/centcom - name = "CentCom Identification Computer" + name = "\improper CentCom identification computer" circuit = /obj/item/weapon/circuitboard/card/centcom req_access = list(access_cent_commander) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6031cce4552..4873fd9ca80 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/cloning - name = "Cloning Console" + name = "cloning console" icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 44e6d95de53..2f064f238a9 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -34,7 +34,7 @@ var/shuttle_call/shuttle_calls[0] // The communications computer /obj/machinery/computer/communications - name = "Communications Console" + name = "communications console" desc = "This can be used for various important functions. Still under developement." icon_keyboard = "tech_key" icon_screen = "comm" diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm index bfd95d46457..2b5f0b92296 100644 --- a/code/game/machinery/computer/hologram.dm +++ b/code/game/machinery/computer/hologram.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/hologram_comp - name = "Hologram Computer" + name = "hologram computer" desc = "Rumoured to control holograms." icon = 'icons/obj/stationobjs.dmi' icon_keyboard = "tech_key" diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 0b31b365033..06e5d102fb2 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/HONKputer - name = "HONKputer Mark I" + name = "\improper HONKputer Mark I" desc = "A yellow computer used in case of critically low levels of HONK." icon = 'icons/obj/machines/HONKputer.dmi' icon_state = "honkputer" diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 383c01a519f..f3ddbe5bb0d 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/aiupload - name = "AI Upload" + name = "\improper AI upload console" desc = "Used to upload laws to the AI." icon_screen = "command" icon_keyboard = "med_key" @@ -64,7 +64,7 @@ return 1 /obj/machinery/computer/borgupload - name = "Cyborg Upload" + name = "cyborg upload console" desc = "Used to upload laws to Cyborgs." icon_screen = "command" icon_keyboard = "med_key" diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 5c47e0f923f..2e1853c598f 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/med_data//TODO:SANITY - name = "Medical Records" + name = "medical records console" desc = "This can be used to check medical records." icon_keyboard = "med_key" icon_screen = "medcomp" @@ -517,8 +517,8 @@ /obj/machinery/computer/med_data/laptop - name = "Medical Laptop" - desc = "Cheap Nanotrasen Laptop." + name = "medical laptop" + desc = "Cheap Nanotrasen laptop." icon_state = "laptop" icon_keyboard = "laptop_key" icon_screen = "medlaptop" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index e8a975d27b1..0ebb13efcd6 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -5,8 +5,8 @@ /obj/machinery/computer/message_monitor - name = "Message Monitor Console" - desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." + name = "message monitoring console" + desc = "Used to monitor the crew's messages that are sent via PDA. It can also be used to view Request Console messages." icon_screen = "comm_logs" light_color = LIGHT_COLOR_GREEN var/hack_icon = "tcboss" diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index a34db3d1526..20509af301d 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -1,8 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/pod - name = "Mass Drivers and Pod Doors Control" - desc = "A controll for launching pods. Some people prefer firing Mechas." + name = "mass drivers and pod doors control" + desc = "A control for launching pods. Some people prefer firing Mechas." icon_screen = "mass_driver" light_color = "#555555" circuit = /obj/item/weapon/circuitboard/pod @@ -268,7 +268,7 @@ /obj/machinery/computer/pod/old/syndicate - name = "External Airlock Controls" + name = "external airlock controls" desc = "The Syndicate operate on a tight budget. Operates external airlocks." req_access = list(access_syndicate) circuit = /obj/item/weapon/circuitboard/syndicatedoor @@ -282,7 +282,7 @@ ..() /obj/machinery/computer/pod/old/swf - name = "Magix System IV" + name = "\improper Magix System IV" desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition" circuit = /obj/item/weapon/circuitboard/swfdoor @@ -315,7 +315,7 @@ P.failchance = 0//So it has no fail chance when teleporting. P.target = pick(spawn_marauder)//Where the marauder will arrive. spawn_marauder.Remove(P.target) - + for(var/obj/machinery/door/poddoor/M in world) if(M.z != src.z) continue if(M.id_tag == ident_tag) diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 060b58eda90..5ac31a0f567 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/podtracker - name = "Pod Tracking Console" + name = "pod tracking console" icon = 'icons/obj/computer.dmi' icon_keyboard = "tech_key" icon_screen = "rdcomp" @@ -9,10 +9,10 @@ /obj/machinery/computer/podtracker/attack_ai(var/mob/user as mob) return attack_hand(user) - + /obj/machinery/computer/podtracker/attack_hand(user as mob) ui_interact(user) - + /obj/machinery/computer/podtracker/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] var/list/pods[0] @@ -28,7 +28,7 @@ if(myPod.occupant2) occupant2 = myPod.occupant2.name pods.Add(list(list("pod" = "\ref[myPod]", "name" = podname, "occupant" = occupant, "occupant2" = occupant2, "x" = myPod.x, "y" = myPod.y, "z" = myPod.z))) - + data["pods"] = pods ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -42,6 +42,6 @@ /obj/machinery/computer/podtracker/Topic(href, href_list) if(..()) return 1 - + if(href_list["refresh"]) nanomanager.update_uis(src) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index ac5d15fc392..6c67ddd71cc 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/prisoner - name = "Prisoner Management" + name = "prisoner management console" icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "explosive" diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 3e860928ef9..4a70b1f74f2 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -11,7 +11,7 @@ var/prison_shuttle_time = 0 var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle - name = "Prison Shuttle Console" + name = "prison shuttle console" icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "syndishuttle" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 017702d67fa..9498a070d98 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,8 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/secure_data//TODO:SANITY - name = "Security Records" - desc = "Used to view and edit personnel's security records" + name = "security records" + desc = "Used to view and edit personnel's security records." icon_keyboard = "security_key" icon_screen = "security" req_one_access = list(access_security, access_forensics_lockers) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 28125a24c96..c2dcd3270a0 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/shuttle - name = "Shuttle" + name = "shuttle control conse" desc = "For shuttle control." icon_keyboard = "tech_key" icon_screen = "shuttle" diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index a2adae97cf3..3dc5a599a6e 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/skills//TODO:SANITY - name = "Employment Records" + name = "employment records console" desc = "Used to view personnel's employment records" icon_state = "laptop" icon_keyboard = "laptop_key" diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 6bd58e74e4f..5d7c67d29ee 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -12,7 +12,7 @@ var/specops_shuttle_time = 0 var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle - name = "Spec. Ops. Shuttle Console" + name = "\improper Spec. Ops. shuttle console" icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "syndishuttle" diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 9f1238c56d2..c40e7968145 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/station_alert - name = "Station Alert Console" + name = "station alert console" desc = "Used to access the station's automated alert system." icon_keyboard = "tech_key" icon_screen = "alert:0" diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 5beab8b5d1e..001578d1fcd 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/merch - name = "Merch Computer" + name = "merch computer" icon = 'icons/obj/computer.dmi' icon_screen = "comm_logs" circuit = /obj/item/weapon/circuitboard/merch diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index a0bcff2139a..76d7bf83a6a 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -11,7 +11,7 @@ var/syndicate_elite_shuttle_time = 0 var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer/syndicate_elite_shuttle - name = "Elite Syndicate Squad Shuttle Console" + name = "\improper Elite Syndicate Squad shuttle console" icon = 'icons/obj/computer.dmi' icon_keyboard = "syndie_key" icon_screen = "syndishuttle" diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 84b99e4dfe5..d154a09b02e 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -4,12 +4,12 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F /obj/machinery/computer/telecrystals - name = "\improper Telecrystal assignment station" + name = "telecrystal assignment station" desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..." ///////////////////////////////////////////// /obj/machinery/computer/telecrystals/uplinker - name = "\improper Telecrystal upload/recieve station" + name = "telecrystal upload/recieve station" desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \ you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant." icon_state = "tcstation" diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 988edaf8580..e560f12e8db 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,6 +1,6 @@ /obj/machinery/kitchen_machine/microwave - name = "Microwave" + name = "microwave" desc = "A microwave, perfect for reheating things with radiation." icon = 'icons/obj/kitchen.dmi' icon_state = "mw" diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 54355179c8e..192d2355656 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -1,6 +1,6 @@ var/datum/announcement/minor/slotmachine_announcement = new(do_log = 0) /obj/machinery/slot_machine - name = "Slot Machine" + name = "slot machine" desc = "Gambling for the antisocial." icon = 'icons/obj/objects.dmi' icon_state = "slots-off" diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 9bc3e77fa1e..a16bbe7b870 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -4,7 +4,7 @@ light_color = LIGHT_COLOR_DARKGREEN /obj/machinery/computer/telecomms/server - name = "Telecommunications Server Monitor" + name = "telecommunications server monitor" icon_screen = "comm_logs" diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 1bd424c0142..f966f477057 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -8,7 +8,7 @@ /obj/machinery/computer/telecomms/monitor - name = "Telecommunications Monitor" + name = "telecommunications monitor" icon_screen = "comm_monitor" var/screen = 0 // the screen number: diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 6e93ab8b7c6..878f39b0394 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/telecomms/traffic - name = "Telecommunications Traffic Control" + name = "telecommunications traffic control" var/screen = 0 // the screen number: var/list/servers = list() // the servers located by the computer diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index d0b62cef441..2df044d7e8a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/teleporter - name = "Teleporter Control Console" + name = "teleporter control console" desc = "Used to control a linked teleportation Hub and Station." icon_screen = "teleport" icon_keyboard = "teleport_key" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index eddbff40b5f..8d414c2168a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -35,7 +35,7 @@ * A vending machine */ /obj/machinery/vending - name = "Vendomat" + name = "\improper Vendomat" desc = "A generic vending machine." icon = 'icons/obj/vending.dmi' icon_state = "generic" @@ -697,7 +697,7 @@ /* /obj/machinery/vending/atmospherics //Commenting this out until someone ponies up some actual working, broken, and unpowered sprites - Quarxink - name = "Tank Vendor" + name = "\improper Tank Vendor" desc = "A vendor with a wide variety of masks and gas tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" @@ -707,7 +707,7 @@ */ /obj/machinery/vending/boozeomat - name = "Booze-O-Mat" + name = "\improper Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles icon_deny = "boozeomat-deny" @@ -743,7 +743,7 @@ component_parts += new /obj/item/weapon/vending_refill/boozeomat(0) /obj/machinery/vending/coffee - name = "Hot Drinks machine" + name = "\improper Hot Drinks machine" desc = "A vending machine which dispenses hot drinks." product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" icon_state = "coffee" @@ -767,8 +767,8 @@ component_parts += new /obj/item/weapon/vending_refill/coffee(0) /obj/machinery/vending/snack - name = "Getmore Chocolate Corp" - desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" + name = "\improper Getmore Chocolate Corp" + desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars." product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" icon_state = "snack" @@ -792,8 +792,8 @@ component_parts += new /obj/item/weapon/vending_refill/snack(0) /obj/machinery/vending/chinese - name = "Mr. Chang" - desc = "A self-serving chinese food machine, for all your chinese food needs." + name = "\improper Mr. Chang" + desc = "A self-serving Chinese food machine, for all your Chinese food needs." product_slogans = "Taste 5000 years of culture!" icon_state = "snack" products = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 5, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 5, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 5, @@ -802,8 +802,8 @@ /obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 50, /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 50) /obj/machinery/vending/cola - name = "Robust Softdrinks" - desc = "A softdrink vendor provided by Robust Industries, LLC." + name = "\improper Robust Softdrinks" + desc = "A soft drink vendor provided by Robust Industries, LLC." icon_state = "Cola_Machine" product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." @@ -829,8 +829,8 @@ //This one's from bay12 /obj/machinery/vending/cart - name = "PTech" - desc = "Cartridges for PDAs" + name = "\improper PTech" + desc = "Cartridges for PDA's." product_slogans = "Carts to go!" icon_state = "cart" icon_deny = "cart-deny" @@ -859,8 +859,8 @@ contraband = list(/obj/item/clothing/under/patriotsuit = 1,/obj/item/weapon/bedsheet/patriot = 3) /obj/machinery/vending/cigarette - name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating - desc = "If you want to get cancer, might as well do it in style" + name = "cigarette machine" + desc = "If you want to get cancer, might as well do it in style." product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 @@ -882,7 +882,7 @@ component_parts += new /obj/item/weapon/vending_refill/cigarette(0) /obj/machinery/vending/medical - name = "NanoMed Plus" + name = "\improper NanoMed Plus" desc = "Medical drug dispenser." icon_state = "med" icon_deny = "med-deny" @@ -898,7 +898,7 @@ //This one's from bay12 /obj/machinery/vending/plasmaresearch - name = "Toximate 3000" + name = "\improper Toximate 3000" desc = "All the fine parts you need in one vending machine!" products = list(/obj/item/clothing/under/rank/scientist = 6,/obj/item/clothing/suit/bio_suit = 6,/obj/item/clothing/head/bio_hood = 6, /obj/item/device/transfer_valve = 6,/obj/item/device/assembly/timer = 6,/obj/item/device/assembly/signaler = 6, @@ -906,7 +906,7 @@ contraband = list(/obj/item/device/assembly/health = 3) /obj/machinery/vending/wallmed1 - name = "NanoMed" + name = "\improper NanoMed" desc = "Wall-mounted Medical Equipment dispenser." product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?" icon_state = "wallmed" @@ -917,7 +917,7 @@ contraband = list(/obj/item/weapon/reagent_containers/syringe/charcoal = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) /obj/machinery/vending/wallmed2 - name = "NanoMed" + name = "\improper NanoMed" desc = "Wall-mounted Medical Equipment dispenser." icon_state = "wallmed" icon_deny = "wallmed-deny" @@ -928,7 +928,7 @@ contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3) /obj/machinery/vending/wallmed1/syndicate - name = "SyndiMed Plus" + name = "\improper SyndiMed Plus" desc = "EVIL wall-mounted Medical Equipment dispenser." icon_state = "syndimed" icon_deny = "syndimed-deny" @@ -938,8 +938,8 @@ contraband = list(/obj/item/weapon/reagent_containers/syringe/charcoal = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) /obj/machinery/vending/security - name = "SecTech" - desc = "A security equipment vendor" + name = "\improper SecTech" + desc = "A security equipment vendor." product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?" icon_state = "sec" icon_deny = "sec-deny" @@ -949,7 +949,7 @@ contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/fancy/donut_box = 2,/obj/item/device/hailer = 5) /obj/machinery/vending/hydronutrients - name = "NutriMax" + name = "\improper NutriMax" desc = "A plant nutrients vendor" product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." @@ -962,7 +962,7 @@ ///obj/item/beezeez = 45, /obj/machinery/vending/hydroseeds - name = "MegaSeed Servitor" + name = "\improper MegaSeed Servitor" desc = "When you need seeds fast!" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" @@ -1007,7 +1007,7 @@ src.product_records.Add(product) /obj/machinery/vending/magivend - name = "MagiVend" + name = "\improper MagiVend" desc = "A magic vending machine." icon_state = "MagiVend" product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" @@ -1056,8 +1056,8 @@ component_parts += new /obj/item/weapon/vending_refill/autodrobe(0) /obj/machinery/vending/dinnerware - name = "Dinnerware" - desc = "A kitchen and restaurant equipment vendor" + name = "\improper Dinnerware" + desc = "A kitchen and restaurant equipment vendor." product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." icon_state = "dinnerware" products = list(/obj/item/weapon/storage/bag/tray = 8,/obj/item/weapon/kitchen/utensil/fork = 6, @@ -1072,15 +1072,15 @@ contraband = list(/obj/item/weapon/kitchen/utensil/spoon = 2,/obj/item/weapon/kitchen/utensil/knife = 2,/obj/item/weapon/kitchen/rollingpin = 2, /obj/item/weapon/butch = 2) /obj/machinery/vending/sovietsoda - name = "BODA" - desc = "Old sweet water vending machine" + name = "\improper BODA" + desc = "Old sweet water vending machine." icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." products = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda = 30) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola = 20) /obj/machinery/vending/tool - name = "YouTool" + name = "\improper YouTool" desc = "Tools for tools." icon_state = "tool" icon_deny = "tool-deny" @@ -1091,7 +1091,7 @@ premium = list(/obj/item/clothing/gloves/color/yellow = 1) /obj/machinery/vending/engivend - name = "Engi-Vend" + name = "\improper Engi-Vend" desc = "Spare tool vending. What? Did you expect some witty description?" icon_state = "engivend" icon_deny = "engivend-deny" @@ -1102,7 +1102,7 @@ //This one's from bay12 /obj/machinery/vending/engineering - name = "Robco Tool Maker" + name = "\improper Robco Tool Maker" desc = "Everything you need for do-it-yourself station repair." icon_state = "engi" icon_deny = "engi-deny" @@ -1119,7 +1119,7 @@ //This one's from bay12 /obj/machinery/vending/robotics - name = "Robotech Deluxe" + name = "\improper Robotech Deluxe" desc = "All the tools you need to create your own robot army." icon_state = "robotics" icon_deny = "robotics-deny" @@ -1132,7 +1132,7 @@ /obj/machinery/vending/eva - name = "Hardsuit Kits" + name = "\improper Hardsuit Kits" desc = "Conversion kits for your alien hardsuit needs." products = list(/obj/item/device/modkit = 6,/obj/item/device/modkit/tajaran = 6,/obj/item/device/modkit/unathi = 6,/obj/item/device/modkit/skrell = 6,/obj/item/device/modkit/vox = 6) @@ -1149,20 +1149,20 @@ contraband = list(/obj/item/weapon/kitchen/utensil/knife = 6) /obj/machinery/vending/hatdispenser - name = "Hatlord 9000" - desc = "It doesn't seem the slightist bit unusual. This frustrates you immensly." + name = "\improper Hatlord 9000" + desc = "It doesn't seem the slightest bit unusual. This frustrates you immensely." icon_state = "hats" - product_ads = "Warning, not all hats are dog/monkey compatable. Apply forcefully with care.;Apply directly to the forehead.;Who doesn't love spending cash on hats?!;From the people that brought you collectable hat crates, Hatlord!" + product_ads = "Warning, not all hats are dog/monkey compatible. Apply forcefully with care.;Apply directly to the forehead.;Who doesn't love spending cash on hats?!;From the people that brought you collectable hat crates, Hatlord!" products = list(/obj/item/clothing/head/bowlerhat = 10,/obj/item/clothing/head/beaverhat = 10,/obj/item/clothing/head/boaterhat = 10,/obj/item/clothing/head/fedora = 10,/obj/item/clothing/head/fez = 10) contraband = list(/obj/item/clothing/head/bearpelt = 5) premium = list(/obj/item/clothing/head/soft/rainbow = 1) refill_canister = /obj/item/weapon/vending_refill/hatdispenser /obj/machinery/vending/suitdispenser - name = "Suitlord 9000" + name = "\improper Suitlord 9000" desc = "You wonder for a moment why all of your shirts and pants come conjoined. This hurts your head and you stop thinking about it." icon_state = "suits" - product_ads = "Pre-Ironed, Pre-Washed, Pre-Wor-*BZZT*;Blood of your enemys washes right out!;Who are YOU wearing?;Look dapper! Look like an idiot!;Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*" + product_ads = "Pre-Ironed, Pre-Washed, Pre-Wor-*BZZT*;Blood of your enemies washes right out!;Who are YOU wearing?;Look dapper! Look like an idiot!;Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*" products = list(/obj/item/clothing/under/color/black = 10,/obj/item/clothing/under/color/blue = 10,/obj/item/clothing/under/color/green = 10,/obj/item/clothing/under/color/grey = 10,/obj/item/clothing/under/color/pink = 10,/obj/item/clothing/under/color/red = 10, /obj/item/clothing/under/color/white = 10, /obj/item/clothing/under/color/yellow = 10,/obj/item/clothing/under/color/lightblue = 10,/obj/item/clothing/under/color/aqua = 10,/obj/item/clothing/under/color/purple = 10,/obj/item/clothing/under/color/lightgreen = 10, /obj/item/clothing/under/color/lightblue = 10,/obj/item/clothing/under/color/lightbrown = 10,/obj/item/clothing/under/color/brown = 10,/obj/item/clothing/under/color/yellowgreen = 10,/obj/item/clothing/under/color/darkblue = 10,/obj/item/clothing/under/color/lightred = 10, /obj/item/clothing/under/color/darkred = 10) @@ -1171,8 +1171,8 @@ refill_canister = /obj/item/weapon/vending_refill/suitdispenser /obj/machinery/vending/shoedispenser - name = "Shoelord 9000" - desc = "Wow, hatlord looked fancy, suitlord looked streamlined, and this is just normal. The guy who disigned these must be an idiot." + name = "\improper Shoelord 9000" + desc = "Wow, hatlord looked fancy, suitlord looked streamlined, and this is just normal. The guy who designed these must be an idiot." icon_state = "shoes" product_ads = "Put your foot down!;One size fits all!;IM WALKING ON SUNSHINE!;No hobbits allowed.;NO PLEASE WILLY, DONT HURT ME- *BZZT*" products = list(/obj/item/clothing/shoes/black = 10,/obj/item/clothing/shoes/brown = 10,/obj/item/clothing/shoes/blue = 10,/obj/item/clothing/shoes/green = 10,/obj/item/clothing/shoes/yellow = 10,/obj/item/clothing/shoes/purple = 10,/obj/item/clothing/shoes/red = 10,/obj/item/clothing/shoes/white = 10,/obj/item/clothing/shoes/sandal=10) @@ -1181,7 +1181,7 @@ refill_canister = /obj/item/weapon/vending_refill/shoedispenser /obj/machinery/vending/syndicigs - name = "Suspicious Cigarette Machine" + name = "\improper Suspicious Cigarette Machine" desc = "Smoke 'em if you've got 'em." product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." @@ -1190,7 +1190,7 @@ products = list(/obj/item/weapon/storage/fancy/cigarettes/syndicate = 10,/obj/item/weapon/lighter/random = 5) /obj/machinery/vending/syndisnack - name = "Getmore Chocolate Corp" + name = "\improper Getmore Chocolate Corp" desc = "A modified snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" @@ -1202,7 +1202,7 @@ //This one's from NTstation //don't forget to change the refill size if you change the machine's contents! /obj/machinery/vending/clothing - name = "ClothesMate" //renamed to make the slogan rhyme + name = "\improper ClothesMate" //renamed to make the slogan rhyme desc = "A vending machine for clothing." icon_state = "clothes" product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!" @@ -1239,7 +1239,7 @@ component_parts += new /obj/item/weapon/vending_refill/clothing(0) /obj/machinery/vending/artvend - name = "ArtVend" + name = "\improper ArtVend" desc = "A vending machine for art supplies." product_slogans = "Stop by for all your artistic needs!;Color the floors with crayons, not blood!;Don't be a starving artist, use ArtVend. ;Don't fart, do art!" product_ads = "Just like Kindergarten!;Now with 1000% more vibrant colors!;Screwing with the janitor was never so easy!;Creativity is at the heart of every spessman." @@ -1254,7 +1254,7 @@ premium = list(/obj/item/weapon/contraband/poster = 5) /obj/machinery/vending/crittercare - name = "CritterCare" + name = "\improper CritterCare" desc = "A vending machine for pet supplies." product_slogans = "Stop by for all your animal's needs!;Cuddly pets deserve a stylish collar!;Pets in space, what could be more adorable?;Freshest fish eggs in the system!;Rocks are the perfect pet, buy one today!" product_ads = "House-training costs extra!;Now with 1000% more cat hair!;Allergies are a sign of weakness!;Dogs are man's best friend. Remember that Vulpkanin!; Heat lamps for Unathi!; Vox-y want a cracker?" @@ -1282,4 +1282,4 @@ component_parts += V component_parts += new /obj/item/weapon/vending_refill/crittercare(0) component_parts += new /obj/item/weapon/vending_refill/crittercare(0) - component_parts += new /obj/item/weapon/vending_refill/crittercare(0) \ No newline at end of file + component_parts += new /obj/item/weapon/vending_refill/crittercare(0) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index f50bc1327dd..7a01a53a8b9 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -198,7 +198,7 @@ return /obj/machinery/computer/mech_bay_power_console - name = "Mech Bay Power Control Console" + name = "mech bay power control console" density = 1 anchored = 1 icon = 'icons/obj/computer.dmi' diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index f85a1586d26..6cc31ad8136 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/mecha - name = "Exosuit Control" + name = "exosuit control console" icon = 'icons/obj/computer.dmi' icon_keyboard = "rd_key" icon_screen = "mecha" diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index b08245b010f..9aa4263859a 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -27,7 +27,7 @@ /obj/item/stack/sheet/animalhide/random - name = "Random animal hide" + name = "random animal hide" New() ..() spawn(1) @@ -80,7 +80,7 @@ name = "unlabelled bottle" pixel_x = rand(-10,10) pixel_y = rand(-10,10) - + /obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink name = "unlabelled drink" icon = 'icons/obj/drinks.dmi' @@ -96,7 +96,7 @@ icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red") pixel_x = rand(-5,5) pixel_y = rand(-5,5) - + /obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent // Same as the chembottle code except the container name = "unlabelled drink?" icon = 'icons/obj/drinks.dmi' @@ -146,7 +146,7 @@ // ------------------------------------- /obj/structure/closet/crate/secure/unknownchemicals - name = "Grey-market Chemicals Grab Pack" + name = "grey-market chemicals grab pack" desc = "Crate full of chemicals of unknown type and value from a 'trusted' source." req_one_access = list(access_chemistry,access_research,access_qm) // the qm knows a guy, you see. @@ -172,7 +172,7 @@ return /obj/structure/closet/crate/secure/chemicals - name = "Chemical Supply Kit" + name = "chemical supply kit" desc = "Full of basic chemistry supplies." req_one_access = list(access_chemistry,access_research) @@ -229,7 +229,7 @@ */ /obj/structure/closet/secure_closet/random_drinks - name = "Unlabelled Booze" + name = "unlabelled booze closet" req_access = list(access_bar) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 31df6806d10..d40799ef1b9 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -17,7 +17,7 @@ var/lit = 0 /obj/item/weapon/lighter/zippo - name = "Zippo lighter" + name = "zippo lighter" desc = "The zippo." icon_state = "zippo" item_state = "zippo" @@ -101,7 +101,7 @@ icon_state = "zippo_nt_off" icon_on = "zippo_nt_on" icon_off = "zippo_nt_off" - + /obj/item/weapon/lighter/zippo/blue name = "blue zippo lighter" desc = "A zippo lighter made of some blue metal." @@ -109,20 +109,20 @@ icon_on = "bluezippoon" icon_off = "bluezippo" -/obj/item/weapon/lighter/zippo/black +/obj/item/weapon/lighter/zippo/black name = "black zippo lighter" desc = "A black zippo lighter." icon_state = "blackzippo" icon_on = "blackzippoon" icon_off = "blackzippo" -/obj/item/weapon/lighter/zippo/engraved +/obj/item/weapon/lighter/zippo/engraved name = "engraved zippo lighter" desc = "A intricately engraved zippo lighter." icon_state = "engravedzippo" icon_on = "engravedzippoon" icon_off = "engravedzippo" - + /obj/item/weapon/lighter/zippo/gonzofist name = "Gonzo Fist zippo" desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish." diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 22ea8981563..82897dfe61a 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -1,6 +1,6 @@ //I still dont think this should be a closet but whatever /obj/structure/closet/fireaxecabinet - name = "Fire Axe Cabinet" + name = "fire axe cabinet" desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." var/obj/item/weapon/twohanded/fireaxe/fireaxe = new/obj/item/weapon/twohanded/fireaxe icon_state = "fireaxe1000" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 05f0b653e13..908a8dc26c4 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -120,7 +120,7 @@ //Paramedic /obj/structure/closet/paramedic - name = "Paramedic Wardrobe" + name = "paramedic wardrobe" desc = "It's a storage unit for paramedic equipment." icon_state = "blue" icon_closed = "blue" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 95ac7f0c949..38321723e2a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/bar - name = "Booze" + name = "Booze cabinet" req_access = list(access_bar) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index c410617775c..e7d23c4a795 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/cargotech - name = "Cargo Technician's Locker" + name = "cargo technician's locker" req_access = list(access_cargo) icon_state = "securecargo1" icon_closed = "securecargo" @@ -20,7 +20,7 @@ return /obj/structure/closet/secure_closet/quartermaster - name = "Quartermaster's Locker" + name = "quartermaster's locker" req_access = list(access_qm) icon_state = "secureqm1" icon_closed = "secureqm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 7dcc838b66f..0ce79c29b17 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/engineering_chief - name = "Chief Engineer's Locker" + name = "chief engineer's locker" req_access = list(access_ce) icon_state = "securece1" icon_closed = "securece" @@ -35,7 +35,7 @@ return /obj/structure/closet/secure_closet/engineering_electrical - name = "Electrical Supplies" + name = "electrical supplies locker" req_access = list(access_engine_equip) icon_state = "secureengelec1" icon_closed = "secureengelec" @@ -65,7 +65,7 @@ /obj/structure/closet/secure_closet/engineering_welding - name = "Welding Supplies" + name = "welding supplies locker" req_access = list(access_engine_equip) icon_state = "secureengweld1" icon_closed = "secureengweld" @@ -89,7 +89,7 @@ /obj/structure/closet/secure_closet/engineering_personal - name = "Engineer's Locker" + name = "engineer's locker" req_access = list(access_engine_equip) icon_state = "secureeng1" icon_closed = "secureeng" @@ -119,7 +119,7 @@ return /obj/structure/closet/secure_closet/atmos_personal - name = "Technician's Locker" + name = "technician's locker" req_access = list(access_atmospherics) icon_state = "secureeng1" icon_closed = "secureeng" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index ef44ad76adc..9342b704087 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -24,7 +24,7 @@ return /obj/structure/closet/secure_closet/freezer/kitchen - name = "Kitchen Cabinet" + name = "kitchen cabinet" req_access = list(access_kitchen) New() @@ -43,7 +43,7 @@ /obj/structure/closet/secure_closet/freezer/meat - name = "Meat Fridge" + name = "meat fridge" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" @@ -62,7 +62,7 @@ /obj/structure/closet/secure_closet/freezer/fridge - name = "Refrigerator" + name = "refrigerator" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" @@ -85,7 +85,7 @@ /obj/structure/closet/secure_closet/freezer/money - name = "Freezer" + name = "freezer" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index fa15c6926e2..c661f3bead0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/hydroponics - name = "Botanist's locker" + name = "botanist's locker" req_access = list(access_hydroponics) icon_state = "hydrosecure1" icon_closed = "hydrosecure" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a2bc3cc0f80..2de9a2adf45 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/medical1 - name = "Medicine Closet" + name = "medicine closet" desc = "Filled with medical junk." icon_state = "medical1" icon_closed = "medical" @@ -28,7 +28,7 @@ /obj/structure/closet/secure_closet/medical2 - name = "Anesthetic" + name = "anesthetic locker" desc = "Used to knock people out." icon_state = "medical1" icon_closed = "medical" @@ -53,7 +53,7 @@ /obj/structure/closet/secure_closet/medical3 - name = "Medical Doctor's Locker" + name = "medical doctor's locker" req_access = list(access_surgery) icon_state = "securemed1" icon_closed = "securemed" @@ -82,7 +82,7 @@ //Exam Room /obj/structure/closet/secure_closet/exam - name = "Exam Room Closet" + name = "exam room closet" desc = "Filled with exam room materials." icon_state = "medical1" icon_closed = "medical" @@ -126,7 +126,7 @@ new /obj/item/weapon/reagent_containers/pill/methamphetamine(src) /obj/structure/closet/secure_closet/psychiatrist - name = "Psychiatrist's Locker" + name = "psychiatrist's locker" req_access = list(access_psychiatrist) icon_state = "securemed1" icon_closed = "securemed" @@ -146,7 +146,7 @@ return /obj/structure/closet/secure_closet/CMO - name = "Chief Medical Officer's Locker" + name = "chief medical officer's locker" req_access = list(access_cmo) icon_state = "cmosecure1" icon_closed = "cmosecure" @@ -190,7 +190,7 @@ /obj/structure/closet/secure_closet/animal - name = "Animal Control" + name = "animal control locker" req_access = list(access_surgery) @@ -206,7 +206,7 @@ /obj/structure/closet/secure_closet/chemical - name = "Chemical Closet" + name = "chemical closet" desc = "Store dangerous chemicals in here." icon_state = "medical1" icon_closed = "medical" @@ -225,7 +225,7 @@ return /obj/structure/closet/secure_closet/medical_wall - name = "First Aid Closet" + name = "first aid closet" desc = "It's a secure wall-mounted storage unit for first aid supplies." icon_state = "medical_wall_locked" icon_closed = "medical_wall_unlocked" @@ -251,7 +251,7 @@ icon_state = icon_opened /obj/structure/closet/secure_closet/paramedic - name = "Paramedic EVA gear" + name = "paramedic EVA gear" desc = "A locker with a Paramedic EVA suit." icon_state = "medical1" icon_closed = "medical" @@ -272,7 +272,7 @@ return /obj/structure/closet/secure_closet/reagents - name = "Chemical Storage Closet" + name = "chemical storage closet" desc = "Store dangerous chemicals in here." icon_state = "chemical1" icon_closed = "chemical" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index c97e60a07e1..01526c99976 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/scientist - name = "Scientist's Locker" + name = "scientist's locker" req_access = list(access_tox_storage) icon_state = "secureres1" icon_closed = "secureres" @@ -25,7 +25,7 @@ /obj/structure/closet/secure_closet/RD - name = "Research Director's Locker" + name = "research director's locker" req_access = list(access_rd) icon_state = "rdsecure1" icon_closed = "rdsecure" @@ -53,7 +53,7 @@ return /obj/structure/closet/secure_closet/research_reagents - name = "Research Chemical Storage Closet" + name = "research chemical storage closet" desc = "Store dangerous chemicals in here." icon_state = "rchemical1" icon_closed = "rchemical" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 6b2da40c7f5..31c67ddc9b5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/captains - name = "Captain's Locker" + name = "captain's locker" req_access = list(access_captain) icon_state = "capsecure1" icon_closed = "capsecure" @@ -32,7 +32,7 @@ /obj/structure/closet/secure_closet/hop - name = "Head of Personnel's Locker" + name = "head of personnel's locker" req_access = list(access_hop) icon_state = "hopsecure1" icon_closed = "hopsecure" @@ -58,7 +58,7 @@ return /obj/structure/closet/secure_closet/hop2 - name = "Head of Personnel's Attire" + name = "head of personnel's attire" req_access = list(access_hop) icon_state = "hopsecure1" icon_closed = "hopsecure" @@ -87,7 +87,7 @@ /obj/structure/closet/secure_closet/hos - name = "Head of Security's Locker" + name = "head of security's locker" req_access = list(access_hos) icon_state = "hossecure1" icon_closed = "hossecure" @@ -126,7 +126,7 @@ /obj/structure/closet/secure_closet/warden - name = "Warden's Locker" + name = "warden's locker" req_access = list(access_armory) icon_state = "wardensecure1" icon_closed = "wardensecure" @@ -166,7 +166,7 @@ /obj/structure/closet/secure_closet/security - name = "Security Officer's Locker" + name = "security officer's locker" req_access = list(access_security) icon_state = "sec1" icon_closed = "sec" @@ -197,7 +197,7 @@ return /obj/structure/closet/secure_closet/brigdoc - name = "Brig Physician's Locker" + name = "brig physician's locker" req_access = list(access_security) icon_state = "securemed1" icon_closed = "securemed" @@ -227,7 +227,7 @@ return /obj/structure/closet/secure_closet/blueshield - name = "Blueshield's Locker" + name = "blueshield's locker" req_access = list(access_blueshield) icon_state = "bssecure1" icon_closed = "bssecure" @@ -258,7 +258,7 @@ return /obj/structure/closet/secure_closet/ntrep - name = "Nanotrasen Representative's Locker" + name = "\improper Nanotrasen Representative's locker" req_access = list(access_ntrep) icon_state = "ntsecure1" icon_closed = "ntsecure" @@ -317,7 +317,7 @@ /obj/structure/closet/secure_closet/detective - name = "Detective's Cabinet" + name = "detective's cabinet" req_access = list(access_forensics_lockers) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" @@ -361,7 +361,7 @@ icon_state = icon_opened /obj/structure/closet/secure_closet/injection - name = "Lethal Injections" + name = "lethal injections locker" req_access = list(access_captain) @@ -375,7 +375,7 @@ /obj/structure/closet/secure_closet/brig - name = "Brig Locker" + name = "brig locker" req_access = list(access_brig) anchored = 1 var/id = null @@ -388,7 +388,7 @@ /obj/structure/closet/secure_closet/courtroom - name = "Courtroom Locker" + name = "courtroom locker" req_access = list(access_court) New() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index fad18f5e176..7e37c7a8988 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -347,14 +347,14 @@ /obj/structure/closet/crate/internals desc = "A internals crate." - name = "Internals crate" + name = "internals crate" icon_state = "o2crate" icon_opened = "o2crateopen" icon_closed = "o2crate" /obj/structure/closet/crate/trashcart desc = "A heavy, metal trashcart with wheels." - name = "Trash Cart" + name = "trash Cart" icon_state = "trashcart" icon_opened = "trashcartopen" icon_closed = "trashcart" @@ -377,14 +377,14 @@ /obj/structure/closet/crate/medical desc = "A medical crate." - name = "Medical crate" + name = "medical crate" icon_state = "medicalcrate" icon_opened = "medicalcrateopen" icon_closed = "medicalcrate" /obj/structure/closet/crate/rcd desc = "A crate for the storage of the RCD." - name = "RCD crate" + name = "\improper RCD crate" icon_state = "crate" icon_opened = "crateopen" icon_closed = "crate" @@ -426,14 +426,14 @@ /obj/structure/closet/crate/bin desc = "A large bin." - name = "Large bin" + name = "large bin" icon_state = "largebin" icon_opened = "largebinopen" icon_closed = "largebin" /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." - name = "Radioactive gear crate" + name = "radioactive gear crate" icon_state = "radiation" icon_opened = "radiationopen" icon_closed = "radiation" @@ -451,21 +451,21 @@ /obj/structure/closet/crate/secure/weapon desc = "A secure weapons crate." - name = "Weapons crate" + name = "weapons crate" icon_state = "weaponcrate" icon_opened = "weaponcrateopen" icon_closed = "weaponcrate" /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." - name = "Plasma crate" + name = "plasma crate" icon_state = "plasmacrate" icon_opened = "plasmacrateopen" icon_closed = "plasmacrate" /obj/structure/closet/crate/secure/gear desc = "A secure gear crate." - name = "Gear crate" + name = "gear crate" icon_state = "secgearcrate" icon_opened = "secgearcrateopen" icon_closed = "secgearcrate" @@ -479,7 +479,7 @@ /obj/structure/closet/crate/secure/bin desc = "A secure bin." - name = "Secure bin" + name = "secure bin" icon_state = "largebins" icon_opened = "largebinsopen" icon_closed = "largebins" @@ -550,7 +550,7 @@ icon_closed = "largermetal" /obj/structure/closet/crate/hydroponics - name = "Hydroponics crate" + name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon_state = "hydrocrate" icon_opened = "hydrocrateopen" diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index e0c07307373..b3f9dac3d04 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -92,5 +92,5 @@ amount = 50 /obj/structure/closet/critter/deer - name = "Deer crate" + name = "deer crate" content_mob = /mob/living/simple_animal/deer \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 4cf3bcf979d..2937e7b58ac 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -3,7 +3,7 @@ /obj/structure/closet/walllocker desc = "A wall mounted storage locker." - name = "Wall Locker" + name = "wall locker" icon = 'icons/obj/walllocker.dmi' icon_state = "wall-locker" density = 0 diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 1dc18de23ba..2a33289d811 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -192,7 +192,7 @@ /obj/structure/flora/kirbyplants - name = "Potted plant" + name = "potted plant" icon = 'icons/obj/flora/plants.dmi' icon_state = "plant-1" anchored = 0 @@ -205,7 +205,7 @@ icon_state = "plant-36" /obj/structure/flora/kirbyplants/dead - name = "RD's potted plant" + name = "/improper RD's potted plant" desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." icon_state = "plant-dead" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index a9f9fa6f26b..770beebd933 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -101,7 +101,7 @@ var/list/mechtoys = list( return 0 /obj/machinery/computer/supplycomp - name = "Supply Shuttle Console" + name = "supply shuttle console" desc = "Used to order supplies." icon = 'icons/obj/computer.dmi' icon_screen = "supply" @@ -115,7 +115,7 @@ var/list/mechtoys = list( var/datum/supply_packs/content_pack /obj/machinery/computer/ordercomp - name = "Supply Ordering Console" + name = "supply ordering console" desc = "Used to order supplies from cargo staff." icon = 'icons/obj/computer.dmi' icon_screen = "request" diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 9c74178259f..b9279f779cb 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -195,7 +195,7 @@ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD /turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph - name = "Brig floor" // Also added it into the 2x3 brig area of the shuttle. + name = "brig floor" // Also added it into the 2x3 brig area of the shuttle. icon_state = "floor4" /turf/simulated/shuttle/floor4/vox //Vox skipjack floors @@ -204,20 +204,20 @@ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD /turf/simulated/floor/beach - name = "Beach" + name = "beach" icon = 'icons/misc/beach.dmi' /turf/simulated/floor/beach/sand - name = "Sand" + name = "sand" icon_state = "sand" /turf/simulated/floor/beach/coastline - name = "Coastline" + name = "coastline" icon = 'icons/misc/beach2.dmi' icon_state = "sandwater" /turf/simulated/floor/beach/water - name = "Water" + name = "water" icon_state = "water" /turf/simulated/floor/beach/water/New() @@ -225,7 +225,7 @@ overlays += image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1) /turf/simulated/floor/grass - name = "Grass patch" + name = "grass patch" icon_state = "grass1" floor_tile = new/obj/item/stack/tile/grass @@ -242,7 +242,7 @@ FF.update_icon() //so siding get updated properly /turf/simulated/floor/carpet - name = "Carpet" + name = "carpet" icon_state = "carpet" floor_tile = new/obj/item/stack/tile/carpet diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm index 7699d653833..09003df1a4d 100644 --- a/code/modules/awaymissions/exile.dm +++ b/code/modules/awaymissions/exile.dm @@ -23,7 +23,7 @@ return dat /obj/item/weapon/implantcase/exile - name = "Glass Case- 'Exile'" + name = "/improper Glass Case- 'Exile'" desc = "A case containing an exile implant." icon = 'icons/obj/items.dmi' icon_state = "implantcase-r" @@ -36,7 +36,7 @@ /obj/structure/closet/secure_closet/exile - name = "Exile Implants" + name = "exile implants" req_access = list(access_hos) New() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 28672d724d5..1d852ed6257 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,5 +1,5 @@ /obj/item/clothing/glasses/hud - name = "HUD" + name = "/improper HUD" desc = "A heads-up display that provides important info in (almost) real time." flags = null //doesn't protect eyes because it's a monocle, duh origin_tech = "magnets=3;biotech=2" @@ -9,20 +9,20 @@ /obj/item/clothing/glasses/hud/health - name = "Health Scanner HUD" + name = "/improper Health Scanner HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." icon_state = "healthhud" HUDType = MEDHUD /obj/item/clothing/glasses/hud/health_advanced - name = "Advanced Health Scanner HUD" + name = "/improper Advanced Health Scanner HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. Includes anti-flash filter." icon_state = "advmedhud" flash_protect = 1 HUDType = MEDHUD /obj/item/clothing/glasses/hud/health/night - name = "Night Vision Health Scanner HUD" + name = "/improper Night Vision Health Scanner HUD" desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." icon_state = "healthhudnight" item_state = "glasses" @@ -32,14 +32,14 @@ /obj/item/clothing/glasses/hud/security - name = "Security HUD" + name = "/improper Security HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records." icon_state = "securityhud" var/global/list/jobs[0] flash_protect = 1 /obj/item/clothing/glasses/hud/security/jensenshades - name = "Augmented shades" + name = "augmented shades" desc = "Polarized bioneural eyewear, designed to augment your vision." icon_state = "jensenshades" item_state = "jensenshades" @@ -47,7 +47,7 @@ invisa_view = 2 /obj/item/clothing/glasses/hud/security/night - name = "Night Vision Security HUD" + name = "/improper Night Vision Security HUD" desc = "An advanced heads-up display which provides id data and vision in complete darkness." icon_state = "securityhudnight" darkness_view = 8 diff --git a/code/modules/computer3/computers/HolodeckControl.dm b/code/modules/computer3/computers/HolodeckControl.dm index cb492c6991b..2b59985bc83 100644 --- a/code/modules/computer3/computers/HolodeckControl.dm +++ b/code/modules/computer3/computers/HolodeckControl.dm @@ -10,7 +10,7 @@ /datum/file/program/holodeck - name = "Holodeck Control Console" + name = "holodeck control console" desc = "Used to control a nearby holodeck." active_state = "holocontrol" var/area/linkedholodeck = null diff --git a/code/modules/computer3/computers/camera.dm b/code/modules/computer3/computers/camera.dm index ddf583888fd..d2180c174a8 100644 --- a/code/modules/computer3/computers/camera.dm +++ b/code/modules/computer3/computers/camera.dm @@ -14,7 +14,7 @@ /obj/machinery/computer3/security/wooden_tv - name = "security cameras" + name = "security cameras console" desc = "An old TV hooked into the stations camera network." icon = 'icons/obj/computer.dmi' icon_state = "security_det" @@ -30,7 +30,7 @@ /obj/machinery/computer3/security/mining - name = "Outpost Cameras" + name = "outpost cameras console" desc = "Used to access the various cameras on the outpost." spawn_files = list(/datum/file/camnet_key/miningoutpost) @@ -80,14 +80,14 @@ name = "Telecomms Network Key" title = "telecommunications satellite" desc = "Connects to telecommunications satellite security cameras." - networks = list("Telecomms") - + networks = list("Telecomms") + /datum/file/camnet_key/researchoutpost name = "Research Outpost Network Key" title = "research outpost" desc = "Connects to research outpost security cameras." networks = list("Research Outpost") - + /datum/file/camnet_key/miningoutpost name = "Mining Outpost Network Key" title = "mining outpost" @@ -100,67 +100,67 @@ title = "research" desc = "Connects to research security cameras." networks = list("Research") - + /datum/file/camnet_key/prison name = "Prison Network Key" title = "prison" desc = "Connects to prison security cameras." networks = list("Prison") - + /datum/file/camnet_key/interrogation name = "Interrogation Network Key" title = "interrogation" desc = "Connects to interrogation security cameras." networks = list("Interrogation") - + /datum/file/camnet_key/supermatter name = "Supermatter Network Key" title = "supermatter" desc = "Connects to supermatter security cameras." networks = list("Supermatter") - + /datum/file/camnet_key/singularity name = "Singularity Network Key" title = "singularity" desc = "Connects to singularity security cameras." networks = list("Singularity") - + /datum/file/camnet_key/anomalyisolation name = "Anomaly Isolation Network Key" title = "anomalyisolation" desc = "Connects to interrogation security cameras." networks = list("Anomaly Isolation") - + /datum/file/camnet_key/toxins name = "Toxins Network Key" title = "toxins" desc = "Connects to toxins security cameras." networks = list("Toxins") - + /datum/file/camnet_key/telepad name = "Telepad Network Key" title = "telepad" desc = "Connects to telepad security cameras." networks = list("Telepad") - + /datum/file/camnet_key/ert name = "Emergency Response Team Network Key" title = "emergency response team" desc = "Connects to emergency response team security cameras." networks = list("ERT") - + /datum/file/camnet_key/centcom name = "Central Command Network Key" title = "central command" desc = "Connects to central command security cameras." networks = list("CentCom") - + /datum/file/camnet_key/thunderdome name = "Thunderdome Network Key" title = "thunderdome" desc = "Connects to thunderdome security cameras." networks = list("Thunderdome") - + /datum/file/camnet_key/entertainment name = "Entertainment Network Key" title = "entertainment" diff --git a/code/modules/computer3/computers/crew.dm b/code/modules/computer3/computers/crew.dm index 2d89b336f80..cbd4f11a67c 100644 --- a/code/modules/computer3/computers/crew.dm +++ b/code/modules/computer3/computers/crew.dm @@ -4,7 +4,7 @@ icon_state = "frame-med" /datum/file/program/crew - name = "Crew Monitoring Console" + name = "crew monitoring console" desc = "Used to monitor active health sensors built into most of the crew's uniforms." active_state = "crew" var/list/tracked = list( ) diff --git a/code/modules/computer3/computers/law.dm b/code/modules/computer3/computers/law.dm index 1ee99e5b9cb..1520f889ee5 100644 --- a/code/modules/computer3/computers/law.dm +++ b/code/modules/computer3/computers/law.dm @@ -1,7 +1,7 @@ /obj/machinery/computer3/aiupload - name = "AI Upload" + name = "\improper AI upload console" desc = "Used to upload laws to the AI." icon_state = "frame-rnd" var/mob/living/silicon/ai/current = null @@ -52,7 +52,7 @@ /obj/machinery/computer3/borgupload - name = "Cyborg Upload" + name = "cyborg upload console" desc = "Used to upload laws to Cyborgs." icon_state = "frame-rnd" var/mob/living/silicon/robot/current = null diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm index 4d96d94878e..7e4a0f1769e 100644 --- a/code/modules/computer3/lapvend.dm +++ b/code/modules/computer3/lapvend.dm @@ -1,5 +1,5 @@ /obj/machinery/lapvend - name = "Laptop Vendor" + name = "laptop vendor" desc = "A generic vending machine." icon = 'icons/obj/vending.dmi' icon_state = "robotics" diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 31ad003135e..d73e93e782f 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -14,7 +14,7 @@ log transactions #define PRINT_DELAY 100 /obj/machinery/atm - name = "Nanotrasen Automatic Teller Machine" + name = "Nanotrasen automatic teller machine" desc = "For all your monetary needs!" icon = 'icons/obj/terminals.dmi' icon_state = "atm" diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index befef4ed4d6..76e3bd4dd15 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -114,7 +114,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f // TODO: Make this an actual /obj/machinery/computer that can be crafted from circuit boards and such // 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. /obj/machinery/librarycomp - name = "Check-In/Out Computer" + name = "check-in/out computer" icon = 'icons/obj/library.dmi' icon_state = "computer" anchored = 1 @@ -473,7 +473,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f qdel(O) else ..() - + /client/proc/delbook() set name = "Delete Book" set desc = "Permamently deletes a book from the database." @@ -485,7 +485,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f var/isbn = input("ISBN number?", "Delete Book") as num | null if(!isbn) return - + var/DBQuery/query_delbook = dbcon.NewQuery("DELETE FROM [format_table_name("library")] WHERE id=[isbn]") if(!query_delbook.Execute()) var/err = query_delbook.ErrorMsg() diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index e9566668b21..12521684dc9 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -66,7 +66,7 @@ proc/move_labor_shuttle() //TODO: Security Access only; add moving the shuttle t return /obj/machinery/computer/labor_shuttle - name = "Labor Shuttle Console" + name = "labor shuttle console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" circuit = /obj/item/weapon/circuitboard/labor_shuttle @@ -112,7 +112,7 @@ proc/move_labor_shuttle() //TODO: Security Access only; add moving the shuttle t /obj/machinery/computer/labor_shuttle/one_way - name = "Prisoner Shuttle Console" + name = "prisoner shuttle console" desc = "A one-way shuttle console, used to summon the shuttle to the labor camp." circuit = /obj/item/weapon/circuitboard/labor_shuttle/one_way req_access = list( ) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 377c66c1b89..e9e925983b8 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -169,7 +169,7 @@ /obj/structure/closet/crate/miningcar desc = "A mining car. This one doesn't work on rails, but has to be dragged." - name = "Mining car (not for rails)" + name = "mining car (not for rails)" icon = 'icons/obj/storage.dmi' icon_state = "miningcar" density = 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c9aafbe2804..92d1c1cdff3 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -238,7 +238,7 @@ var/list/ai_verbs_default = list( The alternative was to rewrite a bunch of AI code instead here we are. */ /obj/machinery/ai_powersupply - name="Power Supply" + name="\improper AI power supply" active_power_usage=1000 use_power = 2 power_channel = EQUIP diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index b59f69ec3c0..34f98cb5893 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/drone_control - name = "Maintenance Drone Control" + name = "maintenance drone control console" desc = "Used to monitor the station's drone population and the assembler that services them." icon_screen = "power" icon_keyboard = "power_key" diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 7f090a72be6..0e7199645c9 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -378,7 +378,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/chem_master - name = "ChemMaster 3000" + name = "\improper ChemMaster 3000" density = 1 anchored = 1 icon = 'icons/obj/chemical.dmi' @@ -756,12 +756,12 @@ /obj/machinery/chem_master/condimaster - name = "CondiMaster 3000" + name = "\improper CondiMaster 3000" condi = 1 /obj/machinery/reagentgrinder - name = "All-In-One Grinder" + name = "\improper All-In-One Grinder" icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 0097cf45907..1526ebcb695 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -2,7 +2,7 @@ /// Droppers. //////////////////////////////////////////////////////////////////////////////// /obj/item/weapon/reagent_containers/dropper - name = "Dropper" + name = "dropper" desc = "A dropper. Transfers 5 units." icon = 'icons/obj/chemical.dmi' icon_state = "dropper" @@ -121,7 +121,7 @@ //////////////////////////////////////////////////////////////////////////////// /obj/item/weapon/reagent_containers/dropper/precision - name = "Pipette" + name = "pipette" desc = "A high precision pippette. Holds 1 unit." icon = 'icons/obj/chemical.dmi' icon_state = "pipette" diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 910860e1b2d..3e97194174e 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -171,7 +171,7 @@ reagents.add_reagent("rice", 30) /obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then - name = "Salt Shaker" // a large one. + name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" possible_transfer_amounts = list(1,20) //for clown turning the lid off @@ -184,7 +184,7 @@ reagents.add_reagent("sodiumchloride", 20) /obj/item/weapon/reagent_containers/food/condiment/peppermill - name = "Pepper Mill" + name = "pepper mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" possible_transfer_amounts = list(1,20) //for clown turning the lid off @@ -197,7 +197,7 @@ reagents.add_reagent("blackpepper", 20) /obj/item/weapon/reagent_containers/food/condiment/syndisauce - name = "Chef Excellence's Special Sauce" + name = "/improper Chef Excellence's Special Sauce" desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious." amount_per_transfer_from_this = 5 volume = 50 diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 5d4c986539a..663158d0757 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -191,7 +191,7 @@ // Formatting is the same as food. /obj/item/weapon/reagent_containers/food/drinks/milk - name = "Space Milk" + name = "\improper Space Milk" desc = "It's milk. White and nutritious goodness!" icon_state = "milk" item_state = "carton" @@ -216,7 +216,7 @@ */ /obj/item/weapon/reagent_containers/food/drinks/soymilk - name = "SoyMilk" + name = "\improper SoyMilk" desc = "It's soy milk. White and nutritious goodness!" icon_state = "soymilk" item_state = "carton" @@ -227,7 +227,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/coffee - name = "Robust Coffee" + name = "\improper Robust Coffee" desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" New() @@ -237,7 +237,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/tea - name = "Duke Purple Tea" + name = "\improper Duke Purple Tea" desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea." icon_state = "teacup" item_state = "coffee" @@ -250,7 +250,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/mugwort - name = "Mugwort Tea" + name = "\improper Mugwort Tea" desc = "A bitter herbal tea." icon_state = "manlydorfglass" item_state = "coffee" @@ -261,7 +261,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/ice - name = "Ice Cup" + name = "\improper Ice Cup" desc = "Careful, cold ice, do not chew." icon_state = "coffee" New() @@ -271,7 +271,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/h_chocolate - name = "Dutch Hot Coco" + name = "\improper Dutch Hot Coco" desc = "Made in Space South America." icon_state = "hot_coco" item_state = "coffee" @@ -282,7 +282,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/chocolate - name = "Hot Chocolate" + name = "\improper Hot Chocolate" desc = "Made in Space Switzerland." icon_state = "hot_coco" item_state = "coffee" @@ -293,7 +293,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/weightloss - name = "Weight-Loss Shake" + name = "\improper Weight-Loss Shake" desc = "A shake designed to cause weight loss. The package proudly proclaims that it is 'tapeworm free.'" icon_state = "coffee" item_state = "coffee" @@ -306,7 +306,7 @@ /obj/item/weapon/reagent_containers/food/drinks/dry_ramen - name = "Cup Ramen" + name = "\improper Cup Ramen" desc = "Just add 10ml water, self heats! A taste that reminds you of your school years." icon_state = "ramen" New() @@ -318,7 +318,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/chicken_soup - name = "Cup Chicken Soup" + name = "\improper Cup Chicken Soup" desc = "A delicious and soothing cup of chicken noodle soup; just like spessmom used to make it." icon_state = "ramen" New() @@ -328,7 +328,7 @@ src.pixel_y = rand(-10.0, 10) /obj/item/weapon/reagent_containers/food/drinks/sillycup - name = "Paper Cup" + name = "paper cup" desc = "A paper water cup." icon_state = "water_cup_e" possible_transfer_amounts = null @@ -349,7 +349,7 @@ // icon states. /obj/item/weapon/reagent_containers/food/drinks/shaker - name = "Shaker" + name = "shaker" desc = "A metal shaker to mix drinks in." icon_state = "shaker" amount_per_transfer_from_this = 10 diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index aa304ca9bdc..17b52aaf5a7 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -120,7 +120,7 @@ //Keeping this here for now, I'll ask if I should keep it here. /obj/item/weapon/broken_bottle - name = "Broken Bottle" + name = "broken bottle" desc = "A bottle with a sharp broken bottom." icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" @@ -136,7 +136,7 @@ var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") /obj/item/weapon/reagent_containers/food/drinks/bottle/gin - name = "Griffeater Gin" + name = "\improper Griffeater Gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" New() @@ -144,7 +144,7 @@ reagents.add_reagent("gin", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey - name = "Uncle Git's Special Reserve" + name = "\improper Uncle Git's Special Reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" New() @@ -152,7 +152,7 @@ reagents.add_reagent("whiskey", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka - name = "Tunguska Triple Distilled" + name = "\improper Tunguska Triple Distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" New() @@ -160,7 +160,7 @@ reagents.add_reagent("vodka", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla - name = "Caccavo Guaranteed Quality Tequilla" + name = "\improper Caccavo Guaranteed Quality Tequilla" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequillabottle" New() @@ -168,7 +168,7 @@ reagents.add_reagent("tequilla", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing - name = "Bottle of Nothing" + name = "\improper Bottle of Nothing" desc = "A bottle filled with nothing" icon_state = "bottleofnothing" New() @@ -176,7 +176,7 @@ reagents.add_reagent("nothing", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/patron - name = "Wrapp Artiste Patron" + name = "\improper Wrapp Artiste Patron" desc = "Silver laced tequilla, served in space night clubs across the galaxy." icon_state = "patronbottle" New() @@ -184,7 +184,7 @@ reagents.add_reagent("patron", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/rum - name = "Captain Pete's Cuban Spiced Rum" + name = "\improper Captain Pete's Cuban Spiced Rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" New() @@ -192,7 +192,7 @@ reagents.add_reagent("rum", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater - name = "Flask of Holy Water" + name = "\improper Flask of Holy Water" desc = "A flask of the chaplain's holy water." icon_state = "holyflask" New() @@ -200,7 +200,7 @@ reagents.add_reagent("holywater", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth - name = "Goldeneye Vermouth" + name = "\improper Goldeneye Vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" New() @@ -208,7 +208,7 @@ reagents.add_reagent("vermouth", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua - name = "Robert Robust's Coffee Liqueur" + name = "\improper Robert Robust's Coffee Liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" icon_state = "kahluabottle" New() @@ -216,7 +216,7 @@ reagents.add_reagent("kahlua", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager - name = "College Girl Goldschlager" + name = "\improper College Girl Goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" New() @@ -224,7 +224,7 @@ reagents.add_reagent("goldschlager", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac - name = "Chateau De Baton Premium Cognac" + name = "\improper Chateau De Baton Premium Cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" New() @@ -232,7 +232,7 @@ reagents.add_reagent("cognac", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/wine - name = "Doublebeard Bearded Special Wine" + name = "\improper Doublebeard Bearded Special Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" New() @@ -240,7 +240,7 @@ reagents.add_reagent("wine", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe - name = "Jailbreaker Verte" + name = "\improper Jailbreaker Verte" desc = "One sip of this and you just know you're gonna have a good time." icon_state = "absinthebottle" New() @@ -250,7 +250,7 @@ //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice - name = "Orange Juice" + name = "orange juice" desc = "Full of vitamins and deliciousness!" icon_state = "orangejuice" item_state = "carton" @@ -260,7 +260,7 @@ reagents.add_reagent("orangejuice", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/cream - name = "Milk Cream" + name = "milk cream" desc = "It's cream. Made from milk. What else did you think you'd find in there?" icon_state = "cream" item_state = "carton" @@ -270,7 +270,7 @@ reagents.add_reagent("cream", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice - name = "Tomato Juice" + name = "tomato juice" desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." icon_state = "tomatojuice" item_state = "carton" @@ -280,7 +280,7 @@ reagents.add_reagent("tomatojuice", 100) /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice - name = "Lime Juice" + name = "lime juice" desc = "Sweet-sour goodness." icon_state = "limejuice" item_state = "carton" diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index f0e7a0ddf69..c733e715398 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -32,7 +32,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, */ /obj/machinery/computer/rdconsole - name = "R&D Console" + name = "\improper R&D console" icon_screen = "rdcomp" icon_keyboard = "rd_key" light_color = LIGHT_COLOR_FADEDPURPLE @@ -1117,23 +1117,23 @@ proc/CallMaterialName(ID) return dat /obj/machinery/computer/rdconsole/core - name = "Core R&D Console" + name = "core R&D console" desc = "A console used to interface with R&D tools." id = 1 /obj/machinery/computer/rdconsole/robotics - name = "Robotics R&D Console" + name = "robotics R&D console" desc = "A console used to interface with R&D tools." id = 2 req_access = list(access_robotics) /obj/machinery/computer/rdconsole/experiment - name = "E.X.P.E.R.I-MENTOR R&D Console" + name = "\improper E.X.P.E.R.I-MENTOR R&D console" desc = "A console used to interface with R&D tools." id = 3 /obj/machinery/computer/rdconsole/mechanics - name = "Mechanics R&D Console" + name = "mechanics R&D console" desc = "A console used to interface with R&D tools." id = 4 req_access = list(access_mechanic) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index a520fe6ec92..c539b0c958f 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -187,7 +187,7 @@ /obj/machinery/computer/rdservercontrol - name = "R&D Server Controller" + name = "\improper R&D server controller" icon_screen = "rdcomp" icon_keyboard = "rd_key" light_color = LIGHT_COLOR_FADEDPURPLE @@ -335,7 +335,7 @@ emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() - + /obj/machinery/r_n_d/server/core name = "Core R&D Server" id_with_upload_string = "1;3" diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm index dc6bdc70521..53f219f7ca4 100644 --- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm +++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm @@ -11,7 +11,7 @@ datum/genesequence #define SCANFOSSIL_RETVAL_SUCCESS 4 /obj/machinery/computer/reconstitutor - name = "Flora reconstitution console" + name = "flora reconstitution console" icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" @@ -39,7 +39,7 @@ datum/genesequence ..() /obj/machinery/computer/reconstitutor/animal - name = "Fauna reconstitution console" + name = "fauna reconstitution console" accepted_fossil_types = list(/obj/item/weapon/fossil/bone,/obj/item/weapon/fossil/shell,/obj/item/weapon/fossil/skull) pod1 = null circuit = /obj/item/weapon/circuitboard/reconstitutor/animal diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index cbc755e2c22..130fd8faa05 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -1,6 +1,6 @@ /obj/machinery/artifact_analyser - name = "Anomaly Analyser" + name = "anomaly analyser" desc = "Studies the emissions of anomalous materials to discover their uses." icon = 'icons/obj/virology.dmi' icon_state = "isolator" diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 1c772d33bf0..ee22edf2fbd 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -1,6 +1,6 @@ /obj/machinery/artifact_harvester - name = "Exotic Particle Harvester" + name = "exotic particle harvester" icon = 'icons/obj/virology.dmi' icon_state = "incubator" //incubator_on anchored = 1 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm index 3d440bf85ab..a93c92a176e 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_scanner.dm @@ -1,6 +1,6 @@ /obj/machinery/artifact_scanpad - name = "Anomaly Scanner Pad" + name = "anomaly scanner pad" desc = "Place things here for scanning." icon = 'icons/obj/stationobjs.dmi' icon_state = "tele0" diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index df6628c6ae7..06f466ec72a 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -36,7 +36,7 @@ P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R" P.stamp(stamp) src.contents += P - + qdel(stamp) //---- Bookcase @@ -57,7 +57,7 @@ //---- Lockers and closets /obj/structure/closet/secure_closet/xenoarchaeologist - name = "Xenoarchaeologist Locker" + name = "xenoarchaeologist locker" req_access = list(access_tox_storage) icon_state = "secureres1" icon_closed = "secureres" @@ -79,7 +79,7 @@ return /obj/structure/closet/excavation - name = "Excavation tools" + name = "excavation tools closet" icon_state = "toolcloset" icon_closed = "toolcloset" icon_opened = "toolclosetopen" diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm index 13cccbc900f..da51366b448 100644 --- a/code/modules/shuttles/antagonist.dm +++ b/code/modules/shuttles/antagonist.dm @@ -10,7 +10,7 @@ return 1 /obj/machinery/computer/shuttle_control/multi/syndicate - name = "Syndicate control console" + name = "\improper Syndicate control console" req_access = list(access_syndicate) shuttle_tag = "Syndicate" is_syndicate = 1 @@ -18,13 +18,13 @@ /obj/machinery/computer/shuttle_control/multi/syndicate/attack_ai(user as mob) user << "Access Denied." return 1 - + /obj/machinery/computer/shuttle_control/multi/xenos name = "alien control console" shuttle_tag = "Xenomorph" icon_keyboard = "telesci_key" icon_screen = "telesci" - + /obj/machinery/computer/shuttle_control/multi/xenos/attack_hand(user as mob) user << "You do not know how to operate this machinery." return 1 @@ -32,18 +32,18 @@ /obj/machinery/computer/shuttle_control/multi/xenos/attack_ai(user as mob) user << "Access Denied." return 1 - + /obj/machinery/computer/shuttle_control/multi/xenos/attack_ghost(user as mob) ui_interact(user) /obj/machinery/computer/shuttle_control/multi/xenos/attack_alien(user as mob) ui_interact(user) - + /obj/machinery/computer/shuttle_control/multi/xenos/CanUseTopic(mob/user) if(isalien(user)) return STATUS_INTERACTIVE - + if(ishuman(user)) return STATUS_CLOSE - + return ..() \ No newline at end of file diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index e6cfb06c910..9211130ee1d 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -1,28 +1,28 @@ /obj/machinery/computer/shuttle_control/mining - name = "Mining Shuttle Console" + name = "mining shuttle console" shuttle_tag = "Mining" req_access = list() circuit = /obj/item/weapon/circuitboard/mining_shuttle /obj/machinery/computer/shuttle_control/engineering - name = "Engineering Shuttle Console" + name = "engineering shuttle console" shuttle_tag = "Engineering" req_one_access_txt = "10;24" circuit = /obj/item/weapon/circuitboard/engineering_shuttle /obj/machinery/computer/shuttle_control/research - name = "Research Shuttle Console" + name = "research shuttle console" shuttle_tag = "Research" req_access = list(access_xenoarch) circuit = /obj/item/weapon/circuitboard/research_shuttle /obj/machinery/computer/shuttle_control/labor_camp - name = "Labor Camp Shuttle Console" + name = "labor camp shuttle console" shuttle_tag = "Labor" req_access = list(access_brig) /obj/machinery/computer/shuttle_control/labor_camp/one_way - name = "Prisoner Shuttle Console" + name = "prisoner shuttle console" req_access = list() /obj/machinery/computer/shuttle_control/labor_camp/one_way/launch() diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 33e86061f5d..a060b0619d4 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/telescience - name = "\improper Telepad Control Console" + name = "telepad control console" desc = "Used to teleport objects to and from the telescience telepad." icon_keyboard = "telesci_key" icon_screen = "telesci" diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index 79c7096ec64..30805f8c28a 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/centrifuge - name = "Isolation Centrifuge" + name = "isolation centrifuge" desc = "Used to separate things with different weight. Spin 'em round, round, right round." icon = 'icons/obj/virology.dmi' icon_state = "centrifuge" diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm index 1db66e49fa4..f298f8a3379 100644 --- a/code/modules/virus2/curer.dm +++ b/code/modules/virus2/curer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/curer - name = "Cure Research Machine" + name = "cure research machine" icon = 'icons/obj/computer.dmi' icon_state = "dna" circuit = /obj/item/weapon/circuitboard/curefab diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index 7173b063b73..4129e77ecf6 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/diseasesplicer - name = "Disease Splicer" + name = "disease splicer console" icon = 'icons/obj/computer.dmi' icon_screen = "crew" icon_keyboard = "med_key"