From a8f5626183b5439f58400b05850bbe3dcf9cf34e Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 1 Jan 2015 03:04:18 +0100 Subject: [PATCH] Fixes typos in crate names from the cargo shuttle. Fixes "mproper" in area and mech names when renaming them. Fixes typos in RCD description. Fixes typo in shock message. --- code/controllers/supply_shuttle.dm | 2 +- code/game/mecha/mecha.dm | 2 +- code/game/objects/items/blueprints.dm | 2 +- code/game/objects/items/weapons/RCD.dm | 6 +++--- code/modules/mob/living/carbon/carbon.dm | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index 5242b0e77f4..82528959946 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -356,7 +356,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle var/datum/supply_packs/SP = SO.object var/atom/A = new SP.containertype(pickedloc) - A.name = "[SP.containername] [SO.comment ? "([SO.comment])":"" ]" + A.name = "[SP.containername][SO.comment ? "([SO.comment])":"" ]" //supply manifest generation begin diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 757cf90e8da..5b530eae4ef 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1489,7 +1489,7 @@ var/year_integer = text2num(year) // = 2013??? return if (href_list["change_name"]) if(usr != src.occupant) return - var/newname = stripped_input(occupant,"Choose new exosuit name","Rename exosuit",initial(name), MAX_NAME_LEN) + var/newname = stripped_input(occupant,"Choose new exosuit name","Rename exosuit","", MAX_NAME_LEN) if(newname && trim(newname)) name = newname else diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 4ba21eaa553..1efe75970f3 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -170,7 +170,7 @@ /obj/item/areaeditor/proc/edit_area() var/area/A = get_area() var/prevname = "[A.name]" - var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", prevname, MAX_NAME_LEN)) + var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 2b4af3a5590..c30082a80aa 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -109,8 +109,8 @@ RCD qdel(W) matter += 20 playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user << "The RCD now holds [matter]/30 matter-units." - desc = "A RCD. It currently holds [matter]/30 matter-units." + user << "The RCD now holds [matter]/100 matter-units." + desc = "A RCD. It currently holds [matter]/100 matter-units." return @@ -237,7 +237,7 @@ RCD if(matter < amount) return 0 matter -= amount - desc = "A RCD. It currently holds [matter]/30 matter-units." + desc = "A RCD. It currently holds [matter]/100 matter-units." return 1 /obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e7fd0006859..b3b58ce8ab9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -82,7 +82,7 @@ //src.adjustFireLoss(shock_damage) //burn_skin will do this for us //src.updatehealth() src.visible_message( - "[src] was shocked by the [source]!", \ + "[src] was shocked by \the [source]!", \ "You feel a powerful shock coursing through your body!", \ "You hear a heavy electrical crack." \ )