From 17b20e3a3ebdf045a3398bac5c5e9dfa452f6ab8 Mon Sep 17 00:00:00 2001 From: Vladin Date: Fri, 29 Jan 2021 16:06:02 -0500 Subject: [PATCH] Sthefo.... stepo..... steto.... ssetho..... THE THING YOU LISTEN TO THE HEART WITH DAMNIT --- code/game/objects/items/storage/firstaid.dm | 4 ++-- .../awaymissions/mission_code/snowdin.dm | 2 +- code/modules/cargo/packs/armory.dm | 2 +- code/modules/clothing/under/syndicate.dm | 12 +++++------ code/modules/library/lib_machines.dm | 2 +- .../projectiles/guns/ballistic/shotgun.dm | 2 +- .../code/modules/client/loadout/_security.dm | 20 +++++++++---------- .../code/modules/client/loadout/uniform.dm | 2 +- .../modules/clothing/under/turtlenecks.dm | 5 +---- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 5321b5ef..dd2d613b 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -324,7 +324,7 @@ /obj/item/storage/pill_bottle/mutarad name = "radiation treatment deluxe pill bottle" - desc = "The label says 'Med-Co branded pills' and below that 'Contains Mutadone in each pill!`." + desc = "The label says 'Med-Co branded pills' and below that 'Contains Mutadone in each pill!'." /obj/item/storage/pill_bottle/mutarad/PopulateContents() for(var/i in 1 to 7) @@ -340,7 +340,7 @@ /obj/item/storage/pill_bottle/breast_enlargement name = "breast enlargement pills" - desc = "Made by Fermichem - They have a woman with breasts larger than she is on them. The warming states not to take more than 10u at a time." + desc = "Made by Fermichem - They have a woman with breasts larger than she is on them. The warning states not to take more than 10u at a time." /obj/item/storage/pill_bottle/breast_enlargement/PopulateContents() for(var/i in 1 to 7) diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 9d1d9d34..d3b6f0e7 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -323,7 +323,7 @@ /obj/item/paper/fluff/awaymissions/snowdin/secnotice name = "Security Notice" - info = {"YOu have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital information is kept secure while the stationed crew obeys protocol. The picked + info = {"You have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital information is kept secure while the stationed crew obeys protocol. The picked staff for this post have been pre-screened with no prior incidients on record, but incase of an issue you have been given a single holding cell and instructions to contact Central to terminate the offending crewmember."} diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index f8c3ba2f..55bb62d3 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -189,7 +189,7 @@ crate_name = "swat crate" /datum/supply_pack/security/armory/swattasers //Lesser AEG tbh - name = "SWAT tatical tasers Crate" + name = "SWAT tactical tasers Crate" desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open." cost = 7000 contains = list(/obj/item/gun/energy/e_gun/stun, diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index a63ebd19..3a481124 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -21,19 +21,19 @@ /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" - desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." - icon_state = "tactifool" + desc = "A robust looking turtleneck designed to fit tightly against the body while still being comfortable." + icon_state = "syndicate" item_state = "bl_suit" - item_color = "tactifool" + item_color = "syndicate" has_sensor = HAS_SENSORS armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) /obj/item/clothing/under/syndicate/tacticool/skirt name = "tacticool skirtleneck" - desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." - icon_state = "tactifool_skirt" + desc = "A robust looking skirtleneck designed to fit tightly against the body while still being comfortable." + icon_state = "syndicate_skirt" item_state = "bl_suit" - item_color = "tactifool_skirt" + item_color = "syndicate_skirt" has_sensor = HAS_SENSORS armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index de17a35e..f4a1525c 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -509,7 +509,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums name = "scanner control interface" icon = 'icons/obj/library.dmi' icon_state = "bigscanner" - desc = "It servers the purpose of scanning stuff." + desc = "It serves the purpose of scanning stuff." density = TRUE var/obj/item/book/cache // Last scanned book diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 0105defd..61e3d31d 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -206,7 +206,7 @@ item_state = "combatshotgun" mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE - unique_reskin = list("Tatical" = "cshotgun", + unique_reskin = list("Tactical" = "cshotgun", "Slick" = "cshotgun_slick" ) diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm index be54c276..9f0c6cec 100644 --- a/modular_citadel/code/modules/client/loadout/_security.dm +++ b/modular_citadel/code/modules/client/loadout/_security.dm @@ -1,41 +1,41 @@ /datum/gear/navyblueuniformhos - name = "Head of Security navyblue uniform" + name = "Head of Security's navyblue uniform" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/head_of_security/navyblue restricted_roles = list("Head of Security") /datum/gear/navybluehosberet - name = "Head of security's Naviblue beret" + name = "Head of Security's navyblue beret" category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navyhos restricted_roles = list("Head of Security") /datum/gear/navybluejackethos - name = "head of security's navyblue jacket" + name = "Head of Security's navyblue jacket" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/security/hos restricted_roles = list("Head of Security") /datum/gear/navybluejacketofficer - name = "security officer's navyblue jacket" + name = "Security Officer's navyblue jacket" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/security/officer restricted_roles = list("Security Officer") /datum/gear/navyblueofficerberet - name = "Security officer's Navyblue beret" + name = "Security Officer's navyblue beret" category = SLOT_HEAD path = /obj/item/clothing/head/beret/sec/navyofficer restricted_roles = list("Security Officer") /datum/gear/navyblueuniformofficer - name = "Security officer navyblue uniform" + name = "Security Officer's navyblue uniform" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/security/navyblue restricted_roles = list("Security Officer") /datum/gear/navybluejacketwarden - name = "warden navyblue jacket" + name = "Warden's navyblue jacket" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/security/warden restricted_roles = list("Warden") @@ -47,7 +47,7 @@ restricted_roles = list("Warden") /datum/gear/navyblueuniformwarden - name = "Warden navyblue uniform" + name = "Warden's navyblue uniform" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/warden/navyblue restricted_roles = list("Warden") @@ -59,13 +59,13 @@ restricted_roles = list("Security Officer", "Warden", "Head of Security") /datum/gear/hosskirt - name = "Head of security's skirt" + name = "Head of Security's skirt" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/head_of_security/skirt restricted_roles = list("Head of Security") /datum/gear/sechud - name = "Security Hud" + name = "Security HUD" category = SLOT_GLASSES path = /obj/item/clothing/glasses/hud/security restricted_roles = list("Security Officer", "Warden", "Head of Security") diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index cb11406d..f0b5c845 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -193,7 +193,7 @@ // Pantsless Sweaters /datum/gear/turtleneck - name = "Tactitool Turtleneck" + name = "Tactifool Turtleneck" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/syndicate/cosmetic diff --git a/modular_citadel/code/modules/clothing/under/turtlenecks.dm b/modular_citadel/code/modules/clothing/under/turtlenecks.dm index fd13da11..6448116c 100644 --- a/modular_citadel/code/modules/clothing/under/turtlenecks.dm +++ b/modular_citadel/code/modules/clothing/under/turtlenecks.dm @@ -23,7 +23,7 @@ new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src) /obj/item/clothing/under/syndicate/cosmetic - name = "tactitool turtleneck" + name = "tactifool turtleneck" desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." icon_state = "tactifool" item_state = "bl_suit" @@ -32,9 +32,6 @@ mutantrace_variation = NO_MUTANTRACE_VARIATION armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) -/obj/item/clothing/under/syndicate/tacticool - has_sensor = TRUE - // Sweaters are good enough for this category too. /obj/item/clothing/under/bb_sweater