diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index c325a0a6a0d..03c96146ea8 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -529,7 +529,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
\nSupply Points: [supply_shuttle.points]
\n
[supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] - [supply_shuttle.shuttle_loan ? (supply_shuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to CentComm*
\n
" : "\nLoan shuttle to CentComm (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] + [supply_shuttle.shuttle_loan ? (supply_shuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to Centcom*
\n
" : "\nLoan shuttle to Centcom (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] \nView requests
\n
\nView orders
\n
\nClose
@@ -572,7 +572,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.sell() supply_shuttle.send() supply_shuttle.shuttle_loan.loan_shuttle() - temp = "The supply shuttle has been loaned to CentComm.

Main Menu" + temp = "The supply shuttle has been loaned to Centcom.

Main Menu" post_signal("supply") else temp = "You can not loan the supply shuttle at this time.

Main Menu" @@ -586,7 +586,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle if(href_list["loan"] && supply_shuttle.shuttle_loan) if(!supply_shuttle.shuttle_loan.dispatched) supply_shuttle.shuttle_loan.loan_shuttle() - temp = "The supply shuttle has been loaned to CentComm.

Main Menu" + temp = "The supply shuttle has been loaned to Centcom.

Main Menu" post_signal("supply") else temp = "You can not loan the supply shuttle at this time.

Main Menu" diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm index 0020859f1d9..092b433b25f 100644 --- a/code/datums/helper_datums/global_iterator.dm +++ b/code/datums/helper_datums/global_iterator.dm @@ -12,7 +12,7 @@ Control functions: If autostart == TRUE, the loop will be started immediately after datum creation. start(list/arguments) - starts the loop. Takes arguments(optional) as a list, which is then used - by process() proc. Returns null if datum already active, 1 if loop started succesfully and 0 if there's + by process() proc. Returns null if datum already active, 1 if loop started successfully and 0 if there's an error in supplied arguments (not list or empty list). stop() - stops the loop. Returns null if datum is already inactive and 1 on success. diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index e2f7979ed36..12df5237a1f 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -386,7 +386,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",

Create a wall

Invoking this rune solidifies the air above it, creating an an invisible wall. To remove the wall, simply invoke the rune again.

Summon cultist

- This rune allows you to summon a fellow cultist to your location. The target cultist must be unhandcuffed ant not buckled to anything. You also need to have 3 people chanting at the rune to succesfully invoke it. Invoking it takes heavy strain on the bodies of all chanting cultists.
+ This rune allows you to summon a fellow cultist to your location. The target cultist must be unhandcuffed ant not buckled to anything. You also need to have 3 people chanting at the rune to successfully invoke it. Invoking it takes heavy strain on the bodies of all chanting cultists.

Free a cultist

This rune unhandcuffs and unbuckles any cultist of your choice, no matter where he is. Invoking it takes heavy strain on the bodies of all chanting cultists.

Deafen

@@ -394,7 +394,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",

Blind

This rune temporarily blinds all non-cultists around you. Very robust. Use together with the deafen rune to leave your enemies completely helpless.

Blood boil

- This rune boils the blood all non-cultists in visible range. The damage is enough to instantly critically hurt any person. You need 3 cultists invoking the rune for it to work. This rune is unreliable and may cause unpredicted effect when invoked. It also drains significant amount of your health when succesfully invoked.
+ This rune boils the blood all non-cultists in visible range. The damage is enough to instantly critically hurt any person. You need 3 cultists invoking the rune for it to work. This rune is unreliable and may cause unpredicted effect when invoked. It also drains significant amount of your health when successfully invoked.

Communicate

Invoking this rune allows you to relay a message to all cultists on the station and nearby space objects.

Stun

diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index e088103fabd..9e1a8552b9d 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -54,7 +54,7 @@ var/datum/trackable/TB = new() for(var/mob/living/M in mob_list) // Easy checks first. - // Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this. + // Don't detect mobs on Centcom. Since the wizard den is on Centcom, we only need this. var/turf/T = get_turf(M) if(!T) continue diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index ef8ce8afda6..64fa4a6985e 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -226,7 +226,7 @@ if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve return for(var/mob/M in range(3,src)) - M.show_message("\b ERROR. Recalibrating projetion apparatus.") + M.show_message("\b ERROR. Recalibrating projection apparatus.") last_change = world.time return @@ -364,7 +364,7 @@ damtype = HALLOSS /obj/item/weapon/holo/esword - desc = "May the force be within you. Sorta" + desc = "May the force be with you. Sorta" icon_state = "sword0" force = 3.0 throw_speed = 1 diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 2fb27438c50..daf8d4585e7 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -263,7 +263,7 @@ That prevents a few funky behaviors. C.overlays.Cut() A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." - U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed." + U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." del(T) if("NINJASUIT") var/obj/item/clothing/suit/space/space_ninja/C = src @@ -274,7 +274,7 @@ That prevents a few funky behaviors. A.loc = T.loc A.cancel_camera() A << "You have been uploaded to a stationary terminal. Remote device connection restored." - U << "\blue Transfer succesful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed." + U << "\blue Transfer succesful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." del(T) if("AIFIXER")//AI Fixer terminal. var/obj/machinery/computer/aifixer/T = target diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8a39ee4a54d..fc2605949b2 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -249,7 +249,7 @@ if(src.build_path == "/obj/machinery/computer/rdconsole/core") src.name = "circuit board (RD Console - Robotics)" src.build_path = "/obj/machinery/computer/rdconsole/robotics" - user << "\blue Access protocols succesfully updated." + user << "\blue Access protocols successfully updated." else src.name = "circuit board (RD Console)" src.build_path = "/obj/machinery/computer/rdconsole/core" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9c268cb8cce..ca522c4d35a 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -198,18 +198,18 @@ stat_msg2 = reject_bad_text(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40) src.updateDialog() - // OMG CENTCOMM LETTERHEAD + // OMG CENTCOM LETTERHEAD if("MessageCentcomm") if(src.authenticated==2) if(centcom_message_cooldown) usr << "Arrays recycling. Please stand by." return - var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to Centcom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return Centcomm_announce(input, usr) usr << "Message transmitted." - log_say("[key_name(usr)] has made a Centcomm announcement: [input]") + log_say("[key_name(usr)] has made a Centcom announcement: [input]") centcom_message_cooldown = 1 spawn(6000)//10 minute cooldown centcom_message_cooldown = 0 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 227ce9d0695..b2a5436ef66 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -45,7 +45,7 @@ //Foreach goto(132) dat += text("
Back", src) if(3.0) - dat += text("Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack", src, src, src, src) + dat += text("Records Maintenance
\nBackup To Disk
\nUpload From Disk
\nDelete All Records
\n
\nBack", src, src, src, src) if(4.0) dat += "
Medical Record

" if(active1 in data_core.general) @@ -344,7 +344,7 @@ R.fields["blood_type"] = "Unknown" R.fields["b_dna"] = "Unknown" R.fields["mi_dis"] = "None" - R.fields["mi_dis_d"] = "No minor disabilities have been declared." + R.fields["mi_dis_d"] = "No minor disabilities have been diagnosed." R.fields["ma_dis"] = "None" R.fields["ma_dis_d"] = "No major disabilities have been diagnosed." R.fields["alg"] = "None" @@ -451,5 +451,5 @@ /obj/machinery/computer/med_data/laptop name = "medical laptop" - desc = "Cheap Nanotrasen Laptop." + desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table." icon_state = "medlaptop" diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 34f7358a6aa..9809be206f9 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -186,9 +186,9 @@ items_measures[display_name] = "slab of meat" items_measures_p[display_name] = "slabs of meat" if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) - display_name = "Turnovers" - items_measures[display_name] = "turnover" - items_measures_p[display_name] = "turnovers" + display_name = "Donk Pockets" + items_measures[display_name] = "donk pocket" + items_measures_p[display_name] = "donk pockets" if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) items_measures[display_name] = "fillet of meat" items_measures_p[display_name] = "fillets of meat" diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index 11de65caff6..0a681094694 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -1,6 +1,6 @@ /obj/machinery/monkey_recycler name = "monkey recycler" - desc = "A machine used for recycling dead monkeys into monkey cubes." + desc = "A machine used for recycling dead monkeys into monkey cubes. It requires 5 monkeys per cube." icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" layer = 2.9 @@ -29,7 +29,7 @@ playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) use_power(500) src.grinded++ - user << "\blue The machine now has [grinded] monkeys worth of material stored." + user << "\blue The machine now has [grinded] monkey\s worth of material stored." else user << "\red The machine only accepts monkeys!" @@ -38,7 +38,7 @@ /obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) if (src.stat != 0) //NOPOWER etc return - if(grinded >=5) + if(grinded >= 5) user << "\blue The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube." playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1) grinded -= 5 diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index f98f7954982..2e473dfbc92 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -35,7 +35,7 @@ cargo_holder.cargo += O O.loc = chassis O.anchored = 0 - occupant_message("[target] succesfully loaded.") + occupant_message("[target] successfully loaded.") log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else occupant_message("You must hold still while handling objects.") @@ -1046,7 +1046,7 @@ cargo_holder.cargo += O O.loc = chassis O.anchored = 0 - chassis.occupant_message("[target] succesfully loaded.") + chassis.occupant_message("[target] successfully loaded.") chassis.log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else chassis.occupant_message("You must hold still while handling objects.") diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 6d3be15c089..7b37c0e9c56 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -246,7 +246,7 @@ if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/crossbow)) for(var/mob/M in viewers(usr, null)) if(M == usr) - usr << "You put \the [W] into [src]." + usr << "You put [W] into [src]." else if(in_range(M, usr)) //If someone is standing close enough, they can tell what it is... M.show_message("[usr] puts [W] into [src].") else if(W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 7a207b8a1e9..ffba4b4b691 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1339,11 +1339,11 @@ usr << "The person you are trying to contact is not wearing a headset" return - var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "") + var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcom", "") if(!input) return src.owner << "You sent [input] to [H] via a secure channel." - log_admin("[src.owner] replied to [key_name(H)]'s Centcomm message with the message [input].") + log_admin("[src.owner] replied to [key_name(H)]'s Centcom message with the message [input].") message_admins("[src.owner] replied to [key_name(H)]'s Centcom message with: \"[input]\"") H << "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"" @@ -1851,7 +1851,7 @@ if(W.z == 1 && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison)) W.req_access = list() message_admins("[key_name_admin(usr)] activated Egalitarian Station mode") - command_alert("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.") + command_alert("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.") world << sound('sound/AI/commandreport.ogg') if("dorf") feedback_inc("admin_secrets_fun_used",1) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 840799f9467..6451ed11748 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -29,7 +29,7 @@ /proc/Centcomm_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "\blue CENTCOMM:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg = "\blue CENTCOM:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" admins << msg /proc/Syndicate_announce(var/text , var/mob/Sender) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 8f513a82ed9..583bdcd42c7 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -162,7 +162,7 @@ /obj/item/clothing/suit/armor/centcom - name = "\improper Centcomm armor" + name = "\improper Centcom armor" desc = "A suit that protects against some damage." icon_state = "centcom" item_state = "centcom" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 67684deccc1..dfe13854b02 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -73,84 +73,84 @@ flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/psyche - name = "psychedelic" + name = "psychedelic jumpsuit" desc = "Groovy!" icon_state = "psyche" item_color = "psyche" /obj/item/clothing/under/lightblue - name = "lightblue" + name = "lightblue jumpsuit" desc = "lightblue" icon_state = "lightblue" item_color = "lightblue" /obj/item/clothing/under/aqua - name = "aqua" + name = "aqua jumpsuit" desc = "aqua" icon_state = "aqua" item_color = "aqua" flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/purple - name = "purple" + name = "purple jumpsuit" desc = "purple" icon_state = "purple" item_state = "p_suit" item_color = "purple" /obj/item/clothing/under/lightpurple - name = "lightpurple" + name = "lightpurple jumpsuit" desc = "lightpurple" icon_state = "lightpurple" item_color = "lightpurple" /obj/item/clothing/under/lightgreen - name = "lightgreen" + name = "lightgreen jumpsuit" desc = "lightgreen" icon_state = "lightgreen" item_color = "lightgreen" /obj/item/clothing/under/lightblue - name = "lightblue" + name = "lightblue jumpsuit" desc = "lightblue" icon_state = "lightblue" item_color = "lightblue" /obj/item/clothing/under/lightbrown - name = "lightbrown" + name = "lightbrown jumpsuit" desc = "lightbrown" icon_state = "lightbrown" item_color = "lightbrown" flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/brown - name = "brown" + name = "brown jumpsuit" desc = "brown" icon_state = "brown" item_color = "brown" flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/yellowgreen - name = "yellowgreen" + name = "yellowgreen jumpsuit" desc = "yellowgreen" icon_state = "yellowgreen" item_color = "yellowgreen" /obj/item/clothing/under/darkblue - name = "darkblue" + name = "darkblue jumpsuit" desc = "darkblue" icon_state = "darkblue" item_color = "darkblue" flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/lightred - name = "lightred" + name = "lightred jumpsuit" desc = "lightred" icon_state = "lightred" item_color = "lightred" /obj/item/clothing/under/darkred - name = "darkred" + name = "darkred jumpsuit" desc = "darkred" icon_state = "darkred" item_color = "darkred" diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 9ba4b862a9d..50393dab127 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -23,18 +23,18 @@ supply_shuttle.shuttle_loan = src switch(dispatch_type) if(HIJACK_SYNDIE) - command_alert("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","CentComm Counter Intelligence") + command_alert("The syndicate are trying to infiltrate your station. If you let them hijack your shuttle, you'll save us a headache.","Centcom Counter Intelligence") if(RUSKY_PARTY) - command_alert("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","CentComm Russian Outreach Program") + command_alert("A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program") if(SPIDER_GIFT) - command_alert("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","CentComm Diplomatic Corps") + command_alert("The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps") if(DEPARTMENT_RESUPPLY) - command_alert("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentComm Supply Department") + command_alert("Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department") thanks_msg = "The shuttle will be returned in 5 minutes." bonus_points = 0 /datum/round_event/shuttle_loan/proc/loan_shuttle() - command_alert(thanks_msg, "Cargo shuttle commandeered by CentComm.") + command_alert(thanks_msg, "Cargo shuttle commandeered by Centcom.") dispatched = 1 supply_shuttle.points += bonus_points @@ -172,7 +172,7 @@ while(crate_types.len > 0) var/datum/supply_order/O = new /datum/supply_order() O.ordernum = supply_shuttle.ordernum - O.orderedby = "CentComm" + O.orderedby = "Centcom" supply_shuttle.shoppinglist += O var/spawn_type = crate_types[crate_types.len] diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 1054b43e4cd..fddb051241d 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -103,9 +103,9 @@ "You hear shredding and ripping.") unbuckle() else - var/text = pick("rips","tears","pulls") + var/text = pick("rip","tear","pull") user.visible_message(\ - "[user.name] [text] at the vines.",\ + "[user.name] [text]s at the vines.",\ "You [text] at the vines.",\ "You hear shredding and ripping.") return diff --git a/code/modules/mob/living/silicon/ai/vox_sounds.dm b/code/modules/mob/living/silicon/ai/vox_sounds.dm index b824150bc92..3502c8d76f1 100644 --- a/code/modules/mob/living/silicon/ai/vox_sounds.dm +++ b/code/modules/mob/living/silicon/ai/vox_sounds.dm @@ -104,7 +104,7 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg', "cargo" = 'sound/vox_fem/cargo.ogg', "ceiling" = 'sound/vox_fem/ceiling.ogg', "celsius" = 'sound/vox_fem/celsius.ogg', -"centcomm" = 'sound/vox_fem/centcomm.ogg', +"centcom" = 'sound/vox_fem/centcom.ogg', "center" = 'sound/vox_fem/center.ogg', "centi" = 'sound/vox_fem/centi.ogg', "central" = 'sound/vox_fem/central.ogg', diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 4ee36b9f107..3e22bd7a6af 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -271,9 +271,9 @@ datum feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]") multiplier = max(multiplier, 1) //this shouldnt happen ... add_reagent(C.result, C.result_amount*multiplier) - + var/list/seen = viewers(4, get_turf(my_atom)) - + if(!istype(my_atom, /mob)) // No bubbling mobs for(var/mob/M in seen) M << "\blue \icon[my_atom] The solution begins to bubble." @@ -284,7 +284,7 @@ datum if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/M in seen) M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction." - ME2.name = "used slime extract" + ME2.name = "\improper used slime extract" ME2.desc = "This extract has been used up." playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ea45c21d4d4..a837fab76fe 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -996,7 +996,7 @@ /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie name = "space twinkie" icon_state = "space_twinkie" - desc = "Guaranteed to survive longer then you will." + desc = "Guaranteed to survive longer than you will." New() ..() reagents.add_reagent("sugar", 4) @@ -2427,4 +2427,4 @@ ..() reagents.add_reagent("nutriment", 2) reagents.add_reagent("sugar", 5) - bitesize = 2 \ No newline at end of file + bitesize = 2 diff --git a/code/unused/powerarmor/powerarmor.dm b/code/unused/powerarmor/powerarmor.dm index 0c6b3b89937..2bf9d94dea2 100644 --- a/code/unused/powerarmor/powerarmor.dm +++ b/code/unused/powerarmor/powerarmor.dm @@ -268,7 +268,7 @@ obj/item/clothing/suit/powered/spawnable/regular New() servos = new /obj/item/powerarmor/servos(src) servos.parent = src - reactive = new /obj/item/powerarmor/reactive/centcomm(src) + reactive = new /obj/item/powerarmor/reactive/centcom(src) reactive.parent = src atmoseal = new /obj/item/powerarmor/atmoseal/optional/adminbus(src) atmoseal.parent = src diff --git a/code/unused/powerarmor/powerarmorcomponents.dm b/code/unused/powerarmor/powerarmorcomponents.dm index 03848b6a25d..07b525115cd 100644 --- a/code/unused/powerarmor/powerarmorcomponents.dm +++ b/code/unused/powerarmor/powerarmorcomponents.dm @@ -113,8 +113,8 @@ if(parent.shoes) parent.shoes.armor[armorvar] = parent.armor[armorvar] - centcomm - name = "CentComm power armor reactive plating" + Centcom + name = "Centcom power armor reactive plating" desc = "Pretty effective against everything, not perfect though." togglearmor = list(melee = 90, bullet = 70, laser = 60,energy = 40, bomb = 75, bio = 75, rad = 75) slowdown = 2 diff --git a/config/admins.txt b/config/admins.txt index d8b930ffaab..c4af8d06bbf 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -32,7 +32,7 @@ sieve = Game Master aranclanos = Game Master intigracy = Game Master dumpdavidson = Game Master -kazeespada = Game Master +kazeespada = Game Master malkevin = Game Master incoming = Game Master demas = Game Master @@ -43,8 +43,10 @@ crimsonvision = Game Master iamgoofball = Game Master zelacks = Game Master androidsfv = Game Master -miauw62 = Game Master +miggles = Game Master jordie0608 = Game Master s0ldi3rkr4s0 = Game Master ergosavi = Game Master vistapowa = Game Master +miauw62 = Game Master +kazeespada = Game Master \ No newline at end of file diff --git a/maps/MetaStation.v38N.dmm b/maps/MetaStation.v38N.dmm index 8ea6a108821..dd3c98214a3 100644 --- a/maps/MetaStation.v38N.dmm +++ b/maps/MetaStation.v38N.dmm @@ -7505,7 +7505,7 @@ "cOq" = (/obj/effect/overlay/palmtree_r,/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/centcom/holding) "cOr" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/centcom/holding) "cOs" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/evac) -"cOt" = (/obj/machinery/door/airlock/glass_security{name = "CentComm Security"; req_access_txt = "2"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) +"cOt" = (/obj/machinery/door/airlock/glass_security{name = "Centcom Security"; req_access_txt = "2"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "cOu" = (/obj/machinery/door/airlock/medical{name = "Patient Room B"; req_access_txt = "5"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/exam_room{name = "Patient Room B"}) "cOv" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/escape/centcom) "cOw" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_station/start) diff --git a/sound/vox_fem/centcomm.ogg b/sound/vox_fem/centcom.ogg similarity index 96% rename from sound/vox_fem/centcomm.ogg rename to sound/vox_fem/centcom.ogg index 9c6404df836..886ebaa4a1d 100644 Binary files a/sound/vox_fem/centcomm.ogg and b/sound/vox_fem/centcom.ogg differ