From 9979255e1abe8d6aab70519562d4084a253faa47 Mon Sep 17 00:00:00 2001 From: FluffMedic <109300046+FluffMedic@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:41:30 -0400 Subject: [PATCH] Apply suggestions from code review Thank you Rae Co-authored-by: Raeschen --- .../submaps/_southern_cross_submaps.dm | 3 ++- .../submaps/gateway/maddnesslab.dm | 18 +++++++++--------- .../code/modules/clothing/gateway/gateway.dm | 12 ++++++------ .../simple_mob/subtypes/gateway/vistors.dm | 8 ++++---- .../code/modules/projectiles/guns/staffs.dm | 2 +- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/maps/southern_cross/submaps/_southern_cross_submaps.dm b/maps/southern_cross/submaps/_southern_cross_submaps.dm index 2749f6f6a0..b748808262 100644 --- a/maps/southern_cross/submaps/_southern_cross_submaps.dm +++ b/maps/southern_cross/submaps/_southern_cross_submaps.dm @@ -45,7 +45,8 @@ #include "gateway/BaseBlep.dm" /datum/map_template/sc_lateload/gateway/baseblep name = "Base Blep" - desc = "A brand new but already lost base at the end of a squishy caynon" + desc = "A brand new but already lost base at the end of a squishy canyon" + mappath = 'gateway/BaseBlep.dmm' associated_map_datum = /datum/map_z_level/sc_lateload/gateway_destination diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dm b/maps/southern_cross/submaps/gateway/maddnesslab.dm index e51a5a4eae..759492a7cd 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dm @@ -12,7 +12,7 @@ /area/awaymission/mol/entrancetunnel /area/awaymission/mol/security - name = " Delta Vault" + name = "Delta Vault" /area/awaymission/mol/medical name = "Delta Checkpoint" @@ -27,10 +27,10 @@ name = "Delta Checkpoint" /area/awaymission/mol/vr/observationroom - name = "Vistor Procress" + name = "Vistor Processing" /area/awaymission/mol/vistortunnel - name = "Vistor Procressing" + name = "Vistor Processing" /area/awaymission/mol/vistortunnel/red name = "Vistor Room Red" @@ -51,7 +51,7 @@ name = "Vistor Purple" /area/awaymission/mol/scraptunnels - name = "Scapery Tunnels" + name = "Scrap Tunnels" /area/awaymission/mol/scraptunnels/room1 name = "Junk Sorting" @@ -99,7 +99,7 @@ name = "Server Room" /area/awaymission/mol/securitycheckpoint - name = "Security Checpoint" + name = "Security Checkpoint" /obj/structure/prop/blackbox/maddnesslab @@ -109,9 +109,9 @@ name = "Black Box Data - Farewell" desc = {"Testing, testing.
Well, this is akward.
- Lab is finnally closed.
+ Lab is finally closed.
Everyone but boss man is gone.
- Which I mean dead, quite, fired, or some combination of them.
+ Which I mean dead, quit, fired, or some combination of them.
And well the labs are a mess, and boss man well...that strange place did things to him.
So, I took charge and did things. I locked boss up firmly in that sphere he so fondly likes.
Locked the armory and hid the switches within the chais we made.
, @@ -119,8 +119,8 @@ Nothing is getting out of there. Except Ashy, they're the one sane thing left.
Not really sure what else to do for my confession.
We did some really messed up stuff man, and planned on doing worse.
- I think boss belivives themselves to be god.
- And with that strange mecha, I don't blame them. Not sure the expirmental janus desgins I've seen
+ I think boss believes themselves to be god.
+ And with that strange mecha, I don't blame them. Not sure the experimental janus designs I've seen
surpass it.
Soo uhhh, yeah we messed up. Imma walk off aimlessly into the desert
Or maybe go home myself if I can bypass my own security measures
diff --git a/modular_chomp/code/modules/clothing/gateway/gateway.dm b/modular_chomp/code/modules/clothing/gateway/gateway.dm index 5f804bd62f..ccc992e56a 100644 --- a/modular_chomp/code/modules/clothing/gateway/gateway.dm +++ b/modular_chomp/code/modules/clothing/gateway/gateway.dm @@ -1,7 +1,7 @@ //vr section /obj/item/clothing/head/vrwizard name = "wizard hat" - desc = "A pointy hat looking pixelate, 0s and 1s dancing off the fabric" + desc = "A pointy pixelated-looking hat, 0s and 1s dancing off the fabric" icon_state = "redwizard" armor = list(melee = 30, bullet = 30, laser = 65, energy = 65, bomb = 70, bio = 100, rad = 100) siemens_coefficient = 0.1 @@ -14,7 +14,7 @@ /obj/item/clothing/suit/vrwizard name = "wizard robes" - desc = "A silky robe with 0s and 1s flying off the seems." + desc = "A silky robe with 0s and 1s flying off the seams." icon_state = "redwizard" armor = list(melee = 30, bullet = 30, laser = 65, energy = 65, bomb = 70, bio = 100, rad = 100) siemens_coefficient = 0.1 @@ -29,7 +29,7 @@ /obj/item/clothing/head/psy_crown/candycrown name = "candy crown" desc = "A crown smelling oddly sweet" - description_info = "It will occassional give a momentary buff to offensive capablities." + description_info = "It will occasionally give a momentary buff to offensive capablities." icon_state = "wrathcrown" cooldown_duration = 1 MINUTES // How long the cooldown should be. brainloss_cost = 0 @@ -60,7 +60,7 @@ ..() if(wearer) if(wearer.can_feel_pain()) - to_chat(wearer, "You feel hungery!") + to_chat(wearer, "You feel hungry!") wearer.custom_pain("Your hands feel strange",1) wearer = null @@ -79,8 +79,8 @@ wearer.nutrition = max(wearer.nutrition + 8, 0) /obj/item/clothing/suit/armor/buffvest - name = "camdy armor" - desc = "A really strange armor amde of similiar substance as the creatures near it." + name = "candy armor" + desc = "A really strange armor made of a similar substance as the creatures near it." icon_state = "armor" blood_overlay_type = "armor" armor = list(melee = 70, bullet = 60, laser = 50, energy = 50, bomb = 0, bio = 0, rad = 0) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm index 4489e85999..e2512d6f17 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm @@ -26,8 +26,8 @@ var/armorcheck = run_armor_check(null, P.check_armour) var/soakedcheck = get_armor_soak(null, P.check_armour) if(!(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))) - visible_message("The [P.name] bounces off of [src]'s sheild!", \ - "The [P.name] bounces off of [src]'s sheild!") + visible_message("The [P.name] bounces off of [src]'s shield!", \ + "The [P.name] bounces off of [src]'s shield!") new /obj/item/weapon/material/shard/shrapnel(src.loc) if(!(P.damage_type == BRUTE || P.damage_type == BURN)) projectile_dam_type = BRUTE @@ -35,8 +35,8 @@ apply_damage(incoming_damage, projectile_dam_type, null, armorcheck, soakedcheck, is_sharp(P), has_edge(P), P) return -1 //Doesn't reflect non-beams or non-energy projectiles. They just smack and drop with little to no effect. else - visible_message("The [P.name] gets reflected by [src]'s sheild!", \ - "The [P.name] gets reflected by [src]'s sheild!") + visible_message("The [P.name] gets reflected by [src]'s shield!", \ + "The [P.name] gets reflected by [src]'s shield!") damage_mod = rand(3,5) incoming_damage = (round(P.damage / damage_mod) - (round((P.damage / damage_mod) * 0.3))) if(!(P.damage_type == BRUTE || P.damage_type == BURN)) diff --git a/modular_chomp/code/modules/projectiles/guns/staffs.dm b/modular_chomp/code/modules/projectiles/guns/staffs.dm index fce57f93c4..27bed99230 100644 --- a/modular_chomp/code/modules/projectiles/guns/staffs.dm +++ b/modular_chomp/code/modules/projectiles/guns/staffs.dm @@ -16,7 +16,7 @@ projectile_type = /obj/item/projectile/energy/homing_bolt/wizard /obj/item/weapon/gun/magic/firestaff/vrwizard/fire - description_info = "It will burn the target along with reduce their bleeding." + description_info = "It will burn the target along with reducing their bleeding." projectile_type = /obj/item/projectile/energy/homing_bolt/wizard/fire color = "#FF0000"