Objectives are empty! Set to kill all rival gang leaders." - - else if (src in ticker.mode.B_bosses) text += "loyal|none|(A) gangster boss|(B) gangster BOSS" text += "
Equipment: give" @@ -306,13 +302,10 @@ var/list/L = current.get_contents() var/obj/item/device/gangtool/gangtool = locate() in L if (gangtool) - text += "
take." + text += "|take." else text += "." - if (objectives.len==0) - text += "
Objectives are empty! Set to kill all rival gang leaders." - else if (src in ticker.mode.A_gang) text += "loyal|none|(A) GANGSTER boss|(B) gangster boss" else if (src in ticker.mode.B_gang) @@ -835,6 +828,8 @@ current << "You are a [gang_name("A")] Gang Boss!" message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.") log_admin("[key_name(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.") + ticker.mode.forge_gang_objectives(src) + ticker.mode.greet_gang(src,0) if("bgang") if(src in ticker.mode.B_gang) @@ -854,11 +849,8 @@ current << "You are a [gang_name("B")] Gang Boss!" message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.") log_admin("[key_name(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.") - - if("autoobjective") ticker.mode.forge_gang_objectives(src) ticker.mode.greet_gang(src,0) - usr << "You can't break your vow of silence that fast!" + still_recharging_msg = "You can't break your vow of silence that fast!" else - still_recharging_msg = "You'll have to wait before you can give your vow of silence again." + still_recharging_msg = "You'll have to wait before you can give your vow of silence again!" ..() /obj/effect/proc_holder/spell/targeted/mime/speak/cast(list/targets) diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 710d98ba015..9a6605ff3ca 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -22,29 +22,29 @@ Also, you never added distance checking after target is selected. I've went ahea */ /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr, distanceoverride) if(!targets.len) - user << "No mind found." + user << "No mind found!" return if(targets.len > 1) - user << "Too many minds! You're not a hive damnit!"//Whaa...aat? + user << "Too many minds! You're not a hive damnit!"//Whaa...aat? return var/mob/living/target = targets[1] if(!(target in oview(range)) && !distanceoverride)//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. - user << "They are too far away!" + user << "They are too far away!" return if(target.stat == DEAD) - user << "You don't particularly want to be dead." + user << "You don't particularly want to be dead!" return if(!target.key || !target.mind) - user << "They appear to be catatonic. Not even magic can affect their vacant mind." + user << "They appear to be catatonic! Not even magic can affect their vacant mind." return if(target.mind.special_role in protected_roles) - user << "Their mind is resisting your spell." + user << "Their mind is resisting your spell!" return var/mob/living/victim = target//The target of the spell whos body will be transferred to. diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index 6309fa53df2..a25186734b5 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -137,11 +137,11 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048 //raises them if they are down (only if power's on) if(!A.locked) A.locked = 1 - A.audible_message("You hear a click from the bottom of the door.", null, 1) + A.audible_message("You hear a click from the bottom of the door.", null, 1) else if(A.hasPower()) //only can raise bolts if power's on A.locked = 0 - A.audible_message("You hear a click from the bottom of the door.", null, 1) + A.audible_message("You hear a click from the bottom of the door.", null, 1) A.update_icon() if(AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 6081eaa8e28..ba6f252724a 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -113,14 +113,14 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", var/colour = href_list["cut"] CutWireColour(colour) else - L << "You need wirecutters!" + L << "You need wirecutters!" else if(href_list["pulse"]) if(istype(I, /obj/item/device/multitool)) var/colour = href_list["pulse"] PulseColour(colour) else - L << "You need a multitool!" + L << "You need a multitool!" else if(href_list["attach"]) var/colour = href_list["attach"] @@ -138,7 +138,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", L.drop_item() Attach(colour, A) else - L << "You need a attachable assembly!" + L << "You need a attachable assembly!" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index da4a45d31b9..2ab48980639 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -125,6 +125,7 @@ proc/process_ghost_teleport_locs() luminosity = 1 lighting_use_dynamic = 1 has_gravity = 1 + valid_territory = 0 /area/start @@ -658,6 +659,7 @@ proc/process_ghost_teleport_locs() requires_power = 0 luminosity = 1 lighting_use_dynamic = 0 + valid_territory = 0 auxport name = "\improper Fore Port Solar Array" @@ -966,6 +968,7 @@ proc/process_ghost_teleport_locs() icon_state = "toxmisc" /area/toxins/test_area + valid_territory = 0 name = "\improper Toxins Test Area" icon_state = "toxtest" diff --git a/code/game/dna.dm b/code/game/dna.dm index 43f11afb6e7..58f5ac12a95 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -403,15 +403,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You lean on the back of [src] and start pushing the door open. (this will take about [breakout_time] minutes.)" - user.visible_message("You hear a metallic creaking from [src]!") + user << "You lean on the back of [src] and start pushing the door open... (this will take about [breakout_time] minutes.)" + user.visible_message("You hear a metallic creaking from [src]!") if(do_after(user,(breakout_time*60*10))) //minutes * 60seconds * 10deciseconds if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked) return locked = 0 - visible_message("[user] successfully broke out of [src]!") + visible_message("[user] successfully broke out of [src]!") user << "You successfully break out of [src]!" open_machine() diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index cd605c9e280..f3a73b5a032 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -35,7 +35,7 @@ return 1 -/datum/game_mode/abduction/proc/make_abductor_team(var/team_number) +/datum/game_mode/abduction/proc/make_abductor_team(var/team_number,var/preset_agent=null,var/preset_scientist=null) //Team Name team_names[team_number] = "Mothership [pick(possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names //Team Objective @@ -43,26 +43,40 @@ team_objective.team = team_number team_objectives[team_number] = team_objective //Team Members - if(antag_candidates.len >=2) - var/datum/mind/scientist = pick(antag_candidates) + + if(!preset_agent || !preset_scientist) + if(antag_candidates.len <=2) + return 0 + + var/datum/mind/scientist + var/datum/mind/agent + + if(!preset_scientist) + scientist = pick(antag_candidates) antag_candidates -= scientist - var/datum/mind/agent = pick(antag_candidates) + else + scientist = preset_scientist + + if(!preset_agent) + agent = pick(antag_candidates) antag_candidates -= agent + else + agent = preset_agent - scientist.assigned_role = "MODE" - scientist.special_role = "Abductor" - log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.") - agent.assigned_role = "MODE" - agent.special_role = "Abductor" - log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.") + scientist.assigned_role = "MODE" + scientist.special_role = "Abductor" + log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.") - abductors += agent - abductors += scientist - scientists[team_number] = scientist - agents[team_number] = agent - return 1 - return 0 + agent.assigned_role = "MODE" + agent.special_role = "Abductor" + log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.") + + abductors |= agent + abductors |= scientist + scientists[team_number] = scientist + agents[team_number] = agent + return 1 /datum/game_mode/abduction/post_setup() //Spawn Team @@ -218,6 +232,7 @@ agent.equip_to_slot_or_del(new /obj/item/weapon/abductor_baton(agent), slot_in_backpack) agent.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/decloner/alien(agent), slot_belt) agent.equip_to_slot_or_del(new /obj/item/device/abductor/silencer(agent), slot_in_backpack) + agent.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/abductor(agent), slot_head) /datum/game_mode/abduction/proc/equip_scientist(var/mob/living/carbon/human/scientist,var/team_number) @@ -236,19 +251,11 @@ /datum/game_mode/abduction/check_finished() - var/all_dead = 1 for(var/team_number=1,team_number<=teams,team_number++) - var/datum/mind/smind = scientists[team_number] - if(smind.current) - var/mob/living/M = smind.current - if(M.stat != DEAD) - all_dead = 0 var/obj/machinery/abductor/console/con = get_team_console(team_number) var/datum/objective/objective = team_objectives[team_number] if (con.experiment.points > objective.target_amount) return 1 - if(all_dead) - return 1 return ..() /datum/game_mode/abduction/declare_completion() diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm index 689d8555d04..0b8b72cb227 100644 --- a/code/game/gamemodes/abduction/abduction_gear.dm +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -133,7 +133,7 @@ /obj/item/device/abductor/proc/AbductorCheck(var/user) if(IsAbductor(user)) return 1 - user << "You can't figure how this works." + user << "You can't figure how this works!" return 0 /obj/item/device/abductor/proc/ScientistCheck(var/user) @@ -155,7 +155,7 @@ if(!AbductorCheck(user)) return if(!ScientistCheck(user)) - user << "You're not trained to use this" + user << "You're not trained to use this!" return if(mode == GIZMO_SCAN) mode = GIZMO_MARK @@ -200,7 +200,7 @@ /obj/item/device/abductor/gizmo/proc/mark(var/atom/target, var/mob/living/user) if(marked == target) - user << "This specimen is already marked." + user << "This specimen is already marked!" return if(istype(target,/mob/living/carbon/human)) if(IsAbductor(target)) @@ -211,12 +211,12 @@ /obj/item/device/abductor/gizmo/proc/prepare(var/atom/target, var/mob/living/user) if(get_dist(target,user)>1) - user << "You need to be next to the specimen to prepare it for transport." + user << "You need to be next to the specimen to prepare it for transport!" return - user << "You start preparing the specimen for transport " + user << "You start preparing the specimen for transport..." if(do_after(user, 100)) marked = target - user << "You finish preparing the specimen for transport " + user << "You finish preparing the specimen for transport." /obj/item/device/abductor/silencer @@ -479,20 +479,58 @@ Congratulations! You are now trained for xenobiology research!"} user <<"The baton is in restrain mode." -obj/item/weapon/scalpel/alien +/obj/item/weapon/scalpel/alien name = "alien scalpel" icon = 'icons/obj/abductor.dmi' -obj/item/weapon/hemostat/alien +/obj/item/weapon/hemostat/alien name = "alien hemostat" icon = 'icons/obj/abductor.dmi' -obj/item/weapon/retractor/alien +/obj/item/weapon/retractor/alien name = "alien retractor" icon = 'icons/obj/abductor.dmi' +/obj/item/weapon/circular_saw/alien + name = "alien saw" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/surgicaldrill/alien + name = "alien drill" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/cautery/alien + name = "alien cautery" + icon = 'icons/obj/abductor.dmi' + /obj/item/clothing/head/helmet/abductor name = "Agent Headgear" desc = "Abducting with style. Spiky style." icon_state = "alienhelmet" item_state = "alienhelmet" + blockTracking = 1 + +// Operating Table / Beds / Lockers + +/obj/structure/optable/abductor + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + can_buckle = 1 + buckle_lying = 1 + +/obj/structure/stool/bed/abductor + name = "resting contraption" + desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?" + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + +/obj/structure/table/abductor + name = "alien table" + desc = "Advanced flat surface technology at work!" + icon_state = "alientable" + +/obj/structure/closet/abductor + name = "alien locker" + desc = "Contains secrets of the universe" + icon_state = "abductor" + icon_door = "abductor" \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_machinery.dm b/code/game/gamemodes/abduction/abduction_machinery.dm deleted file mode 100644 index 05a99e9eb34..00000000000 --- a/code/game/gamemodes/abduction/abduction_machinery.dm +++ /dev/null @@ -1,500 +0,0 @@ -/obj/machinery/abductor - var/team = 0 - -/obj/machinery/abductor/console - name = "Abductor console" - desc = "Ship command center." - icon = 'icons/obj/abductor.dmi' - icon_state = "console" - density = 1 - anchored = 1.0 - var/obj/item/device/abductor/gizmo/gizmo - var/obj/item/clothing/suit/armor/abductor/vest/vest - var/obj/machinery/abductor/experiment/experiment - var/obj/machinery/abductor/pad/pad - var/list/datum/icon_snapshot/disguises = list() - -/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) - if(..()) - return - if(!IsAbductor(user)) - return - user.set_machine(src) - var/dat = "" - dat += "
Abductsoft 3000
" - - if(experiment != null) - var/points = experiment.points - dat += "Collected Samples : [points]" - else - dat += "NO EXPERIMENT MACHINE DETECTED
" - - if(pad!=null) - dat += "Activate Teleporter
" - dat += "Set Teleporter
" - if(gizmo!=null && gizmo.marked!=null) - dat += "Retrieve Mark
" - else - dat += "Retrieve Mark
" - else - dat += "NO TELEPAD DETECTED" - - if(vest!=null) - dat += "
Agent Vest Mode
" - var/mode = vest.mode - if(mode == VEST_STEALTH) - dat += "Combat" - dat += "Stealth" - else - dat += "Combat" - dat += "Stealth" - - dat+="
" - dat += "Select Agent Vest Disguise
" - else - dat += "NO AGENT VEST DETECTED" - var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/abductor/console/Topic(href, href_list) - if(..()) - return - if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - if(href_list["teleporter_set"]) - TeleporterSet() - else if(href_list["teleporter_send"]) - TeleporterSend() - else if(href_list["teleporter_retrieve"]) - TeleporterRetrieve() - else if(href_list["flip_vest"]) - FlipVest() - else if(href_list["select_disguise"]) - SelectDisguise() - src.updateUsrDialog() - -/obj/machinery/abductor/console/proc/TeleporterSet() - var/A = null - A = input("Select area to teleport to", "Teleport", A) in teleportlocs - if(pad!=null) - pad.teleport_target = teleportlocs[A] - return - -/obj/machinery/abductor/console/proc/TeleporterRetrieve() - if(gizmo!=null && pad!=null && gizmo.marked) - pad.Retrieve(gizmo.marked) - return - -/obj/machinery/abductor/console/proc/TeleporterSend() - if(pad!=null) - pad.Send() - return - -/obj/machinery/abductor/console/proc/FlipVest() - if(vest!=null) - vest.flip_mode() - return - -/obj/machinery/abductor/console/proc/SelectDisguise() - var/list/entries = list() - var/tempname - var/datum/icon_snapshot/temp - for(var/i = 1; i <= disguises.len; i++) - temp = disguises[i] - tempname = temp.name - entries["[tempname]"] = disguises[i] - var/entry_name = input( "Choose Disguise", "Disguise") in entries - var/datum/icon_snapshot/chosen = entries[entry_name] - if(chosen) - vest.SetDisguise(chosen) - return - -/obj/machinery/abductor/console/proc/Initialize() - - for(var/obj/machinery/abductor/pad/p in machines) - if(p.team == team) - pad = p - break - - for(var/obj/machinery/abductor/experiment/e in machines) - if(e.team == team) - experiment = e - e.console = src - -/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) - var/datum/icon_snapshot/entry = new - entry.name = target.name - entry.icon = target.icon - entry.icon_state = target.icon_state - entry.overlays = target.get_overlays_copy(list(L_HAND_LAYER,R_HAND_LAYER)) - for(var/i=1,i<=disguises.len,i++) - var/datum/icon_snapshot/temp = disguises[i] - if(temp.name == entry.name) - disguises[i] = entry - return - disguises.Add(entry) - return - -/obj/machinery/abductor/pad - name = "Alien Telepad" - desc = "Use this to transport to and from human habitat" - icon = 'icons/obj/abductor.dmi' - icon_state = "alien-pad-idle" - anchored = 1 - var/area/teleport_target - -/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) - if(!H.dna) - return 0 - return H.dna.species.id == "abductor" - -/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - return S.agent - return 0 - -/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) - if(H.dna.species.id == "abductor") - var/datum/species/abductor/S = H.dna.species - return S.scientist - return 0 - -/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) - var/list/L = list() - for(var/turf/T in get_area_turfs(thearea.type)) - if(!T.density) - var/clear = 1 - for(var/obj/O in T) - if(O.density) - clear = 0 - break - if(clear) - L+=T - if(!L.len) - return - - if(target && target.buckled) - target.buckled.unbuckle_mob() - - var/list/tempL = L - var/attempt = null - var/success = 0 - while(tempL.len) - attempt = pick(tempL) - target.Move(attempt) - if(get_turf(target) == attempt) - success = 1 - break - else - tempL.Remove(attempt) - if(!success) - target.loc = pick(L) - -/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) - target.Move(src.loc) - -/obj/machinery/abductor/pad/proc/Send() - flick("alien-pad", src) - for(var/mob/living/target in src.loc) - TeleportToArea(target,teleport_target) - spawn(0) - anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) - -/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/carbon/human/target) - flick("alien-pad", src) - spawn(0) - anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) - Warp(target) - -/obj/machinery/abductor/experiment - name = "Experimental machinery" - desc = "A human-sized coffin sporting wide array of automatic surgery tools" - icon = 'icons/obj/abductor.dmi' - icon_state = "experiment-open" - density = 0 - anchored = 1 - state_open = 1 - var/points = 0 - var/list/history = new - var/flash = " - || - " - var/obj/machinery/abductor/console/console - -/obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) - return - if(IsAbductor(target)) - return - close_machine(target) - -/obj/machinery/abductor/experiment/allow_drop() - return 0 - -/obj/machinery/abductor/experiment/attack_hand(mob/user) - if(..()) - return - - experimentUI(user) - -/obj/machinery/abductor/experiment/open_machine() - if(!state_open && !panel_open) - ..() - -/obj/machinery/abductor/experiment/close_machine(mob/target) - for(var/mob/living/carbon/C in loc) - if(IsAbductor(C)) - return - if(state_open && !panel_open) - ..(target) - -/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) - var/icon/photo = null - var/g = (H.gender == FEMALE) ? "f" : "m" - if(!config.mutant_races || H.dna.species.use_skintones) - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]_s") - else - photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]_s") - photo.Blend("#[H.dna.mutant_color]", ICON_MULTIPLY) - - var/icon/eyes_s - if(EYECOLOR in H.dna.species.specflags) - eyes_s = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[H.dna.species.eyes]_s") - eyes_s.Blend("#[H.eye_color]", ICON_MULTIPLY) - - var/datum/sprite_accessory/S - S = hair_styles_list[H.hair_style] - if(S && (HAIR in H.dna.species.specflags)) - var/icon/hair_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") - hair_s.Blend("#[H.hair_color]", ICON_MULTIPLY) - eyes_s.Blend(hair_s, ICON_OVERLAY) - - S = facial_hair_styles_list[H.facial_hair_style] - if(S && (FACEHAIR in H.dna.species.specflags)) - var/icon/facial_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") - facial_s.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) - eyes_s.Blend(facial_s, ICON_OVERLAY) - - if(eyes_s) - photo.Blend(eyes_s, ICON_OVERLAY) - - var/icon/splat = icon("icon" = 'icons/mob/dam_human.dmi',"icon_state" = "chest30") - photo.Blend(splat,ICON_OVERLAY) - - return photo - -/obj/machinery/abductor/experiment/proc/experimentUI(mob/user) - var/dat - dat += "
Experiment
" - if(occupant) - var/obj/item/weapon/photo/P = new - P.photocreate(null, icon(dissection_icon(occupant), dir = SOUTH)) - user << browse_rsc(P.img, "dissection_img") - dat += "| "
- dat += " | "
- dat += "Probe " - dat += "Dissect " - dat += "Analyze " - dat += " |
Machine Unoccupied
" - else - dat += "Subject Status :
" - dat += "[occupant.name] => " - switch(occupant.stat) - if(0) - dat += "Conscious" - if(1) - dat += "Unconscious" - else - dat += "DEAD" - dat += "" - dat += "[flash]" - dat += "
" - dat += "Scan" - dat += "Close" : "open=1'>Open"]" - var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) - popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) - popup.set_content(dat) - popup.open() - -/obj/machinery/abductor/experiment/Topic(href, href_list) - if(..() || usr == occupant) - return - usr.set_machine(src) - if(href_list["refresh"]) - updateUsrDialog() - return - if(href_list["open"]) - open_machine() - return - if(href_list["close"]) - close_machine() - return - if(occupant && occupant.stat != DEAD) - if(href_list["experiment"]) - flash = Experiment(occupant,href_list["experiment"]) - updateUsrDialog() - add_fingerprint(usr) - -/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) - var/mob/living/carbon/human/H = occupant - var/point_reward = 0 - if(H in history) - return "Specimen already in the database" - if(H.stat == DEAD) - say("Specimen deceased - please provide fresh sample.") - return "Specimen Deceased" - var/obj/item/gland/GlandTest = locate() in H - if(!GlandTest) - say("Experimental dissection not detected!") - return "No glands detected!" - if(H.mind != null || H.ckey != null) - history += H - say("Processing Specimen...") - sleep(5) - switch(text2num(type)) - if(1) - H << "You feel violated." - if(2) - H << "You feel being sliced and put back together." - if(3) - H << "You feel under intense scrutiny." - sleep(5) - H << "Your mind snaps!" - var/objtype = pick(typesof(/datum/objective/abductee/) - /datum/objective/abductee/) - var/datum/objective/abductee/O = new objtype() - H.mind.objectives += O - var/obj_count = 1 - H << "Your current objectives:" - for(var/datum/objective/objective in H.mind.objectives) - H << "Objective #[obj_count]: [objective.explanation_text]" - obj_count++ - - for(var/obj/item/gland/G in H) - G.Start() - point_reward++ - if(point_reward > 0) - open_machine() - SendBack(H) - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - points += point_reward - return "Experiment Successfull! [point_reward] new data-points collected." - else - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) - return "Experiment Failed! No replacement organ detected." - else - say("Brain Activity Nonexistant - Disposing Sample...") - open_machine() - SendBack(H) - return "Specimen Braindead - Disposed" - return "ERROR" - - -/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) - H.Sleeping(8) - var/area/A - if(console && console.pad && console.pad.teleport_target) - A = console.pad.teleport_target - else - A = teleportlocs[pick(teleportlocs)] - TeleportToArea(H,A) - -/obj/machinery/abductor/experiment/update_icon() - if(state_open) - icon_state = "experiment-open" - else - icon_state = "experiment" - -/obj/machinery/abductor/experiment/say_quote(text) - return "beeps, \"[text]\"" - - -/obj/machinery/abductor/gland_dispenser - name = "Replacement Organ Storage" - desc = "A tank filled with replacement organs" - icon = 'icons/obj/abductor.dmi' - icon_state = "dispenser" - density = 1 - anchored = 1 - var/list/gland_types - var/list/gland_colors - var/list/amounts - -/obj/machinery/abductor/gland_dispenser/proc/random_color() - //TODO : replace with presets or spectrum - return rgb(rand(0,255),rand(0,255),rand(0,255)) - -/obj/machinery/abductor/gland_dispenser/New() - gland_types = typesof(/obj/item/gland) - /obj/item/gland - gland_types = shuffle(gland_types) - gland_colors = new/list(gland_types.len) - amounts = new/list(gland_types.len) - for(var/i=1,i<=gland_types.len,i++) - gland_colors[i] = random_color() - amounts[i] = rand(1,5) - -/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) - if(..()) - return - if(!IsAbductor(user)) - return - user.set_machine(src) - var/box_css = {" - "} - var/dat = "" - var/item_count = 0 - for(var/i=1,i<=gland_colors.len,i++) - item_count++ - var/g_color = gland_colors[i] - var/amount = amounts[i] - dat += "[amount]" - if(item_count == 3) // Three boxes per line - dat +="" - item_count = 0 - var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) - popup.add_head_content(box_css) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - -/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/gland)) - user.drop_item() - W.loc = src - for(var/i=1,i<=gland_colors.len,i++) - if(gland_types[i] == W.type) - amounts[i]++ - -/obj/machinery/abductor/gland_dispenser/Topic(href, href_list) - if(..()) - return - if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - if(href_list["dispense"]) - Dispense(text2num(href_list["dispense"])) - src.updateUsrDialog() - -/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) - if(amounts[count]>0) - amounts[count]-- - var/T = gland_types[count] - new T(get_turf(src)) \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_surgery.dm b/code/game/gamemodes/abduction/abduction_surgery.dm index 62308897062..a618e1d2544 100644 --- a/code/game/gamemodes/abduction/abduction_surgery.dm +++ b/code/game/gamemodes/abduction/abduction_surgery.dm @@ -5,6 +5,7 @@ location = "chest" user_species_restricted = 1 user_species_ids = list("abductor") + ignore_clothes = 1 /datum/surgery_step/extract_organ accept_hand = 1 @@ -17,16 +18,16 @@ if(I.type in organ_types) IC = I break - user.visible_message("[user] starts to remove [target]'s organs.") + user.visible_message("[user] starts to remove [target]'s organs.", "You start to remove [target]'s organs...") /datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(IC) - user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!") + user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].") user.put_in_hands(IC) target.internal_organs -= IC return 1 else - user.visible_message("[user] doesn't find anything in [target]'s [target_zone].") + user << "You don't find anything in [target]'s [target_zone]!" return 0 /datum/surgery_step/gland_insert @@ -34,10 +35,10 @@ time = 32 /datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts to insert [tool] into [target].") + user.visible_message("[user] starts to insert [tool] into [target].", "You start to insert [tool] into [target]...") /datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] inserts [tool] into [target].") + user.visible_message("[user] inserts [tool] into [target].", "You insert [tool] into [target].") user.drop_item() var/obj/item/gland/gland = tool gland.Inject(target) diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 4a0110ac30b..b20e7c98b85 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -3,10 +3,9 @@ desc = "Eww" icon = 'icons/obj/abductor.dmi' icon_state = "gland" - var/cooldown_low = 30 - var/cooldown_high = 30 - var/cooldown_current = 0 - var/cooldown = 0 + var/cooldown_low = 300 + var/cooldown_high = 300 + var/next_activation = 0 var/uses // -1 For inifinite var/active = 0 var/mob/living/carbon/human/host @@ -19,6 +18,7 @@ /obj/item/gland/proc/Start() active = 1 + next_activation = world.time + rand(cooldown_low,cooldown_high) SSobj.processing |= src /obj/item/gland/proc/Inject(var/mob/living/carbon/human/target) @@ -30,16 +30,14 @@ if(!active) SSobj.processing.Remove(src) return - cooldown++ - if(cooldown >= cooldown_current) + if(next_activation <= world.time) //This gives a chance to transplant the gland active into someone else if you're fast if(!HostCheck()) active = 0 return activate() uses-- - cooldown = 0 - cooldown_current = rand(cooldown_low,cooldown_high) + next_activation = world.time + rand(cooldown_low,cooldown_high) if(uses == 0) active = 0 @@ -47,8 +45,8 @@ return /obj/item/gland/heals - cooldown_low = 20 - cooldown_high = 40 + cooldown_low = 200 + cooldown_high = 400 uses = -1 icon_state = "health" @@ -59,8 +57,8 @@ obj/item/gland/heals/activate() host.adjustFireLoss(-20) /obj/item/gland/slime - cooldown_low = 60 - cooldown_high = 120 + cooldown_low = 600 + cooldown_high = 1200 uses = -1 icon_state = "slime" @@ -82,8 +80,8 @@ obj/item/gland/slime/activate() Slime.Leader = host /obj/item/gland/mindshock - cooldown_low = 30 - cooldown_high = 30 + cooldown_low = 300 + cooldown_high = 300 uses = -1 icon_state = "mindshock" @@ -98,9 +96,9 @@ obj/item/gland/slime/activate() H.confused += 20 /obj/item/gland/pop - cooldown_low = 120 - cooldown_high = 180 - uses = 5 + cooldown_low = 900 + cooldown_high = 1800 + uses = 6 icon_state = "species" /obj/item/gland/pop/activate() @@ -111,8 +109,8 @@ obj/item/gland/slime/activate() return /obj/item/gland/ventcrawling - cooldown_low = 180 - cooldown_high = 240 + cooldown_low = 1800 + cooldown_high = 2400 uses = 1 icon_state = "vent" @@ -124,8 +122,8 @@ obj/item/gland/slime/activate() /obj/item/gland/viral - cooldown_low = 180 - cooldown_high = 240 + cooldown_low = 1800 + cooldown_high = 2400 uses = 1 icon_state = "viral" @@ -140,18 +138,17 @@ obj/item/gland/slime/activate() /obj/item/gland/emp //TODO : Replace with something more interesting - cooldown_low = 90 - cooldown_high = 160 - uses = 5 + cooldown_low = 900 + cooldown_high = 1600 + uses = 10 icon_state = "emp" /obj/item/gland/emp/activate() empulse(get_turf(host), 2, 5, 1) - /obj/item/gland/spiderman - cooldown_low = 90 - cooldown_high = 160 + cooldown_low = 450 + cooldown_high = 900 uses = 10 icon_state = "spider" @@ -161,12 +158,98 @@ obj/item/gland/slime/activate() new /obj/effect/spider/spiderling(host.loc) /obj/item/gland/egg - cooldown_low = 60 - cooldown_high = 90 + cooldown_low = 300 + cooldown_high = 600 uses = -1 icon_state = "egg" /obj/item/gland/egg/activate() var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(host.loc) egg.reagents.add_reagent("sacid",20) - egg.desc += " It smells bad." \ No newline at end of file + egg.desc += " It smells bad." + +/obj/item/gland/bloody + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + +/obj/item/gland/bloody/activate() + host.adjustBruteLoss(15) + + host.visible_message("[host] skin erupts with blood!",\ + "Your skin erupts with blood! It hurts!") + + for(var/turf/T in oview(3,host)) //Make this respect walls and such + T.add_blood_floor(host) + for(var/mob/living/carbon/human/H in oview(3,host)) //Blood decals for simple animals would be neat. aka Carp with blood on it. + if(H.wear_suit) + H.wear_suit.add_blood(host) + H.update_inv_wear_suit(0) + else if(H.w_uniform) + H.w_uniform.add_blood(host) + H.update_inv_w_uniform(0) + +/obj/item/gland/bodysnatch + cooldown_low = 600 + cooldown_high = 600 + uses = 1 + +/obj/item/gland/bodysnatch/activate() + //spawn cocoon with clone greytide snpc inside + var/obj/effect/cocoon/abductor/C = new (get_turf(host)) + C.Copy(host) + C.Start() + host.gib() + return + +/obj/effect/cocoon/abductor + name = "Slimy cocoon" + desc = "You can see something moving inside" + icon = 'icons/effects/effects.dmi' + icon_state = "cocoon_large3" + color = rgb(10,120,10) + density = 1 + var/hatch_time = 0 + +/obj/effect/cocoon/abductor/proc/Copy(var/mob/living/carbon/human/H) + var/mob/living/carbon/human/interactive/greytide/clone = new(src) + hardset_dna(clone,H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.mutant_color) + + //There's no define for this / get all items ? + var/list/slots = list(slot_back,slot_w_uniform,slot_wear_suit,\ + slot_wear_mask,slot_head,slot_shoes,slot_gloves,slot_ears,\ + slot_glasses,slot_belt,slot_s_store,slot_l_store,slot_r_store,slot_wear_id) + + for(var/slot in slots) + var/obj/item/I = H.get_item_by_slot(slot) + if(I) + clone.equip_to_slot_if_possible(I,slot) + +/obj/effect/cocoon/abductor/proc/Start() + hatch_time = world.time + 600 + SSobj.processing |= src + +/obj/effect/cocoon/abductor/process() + if(world.time > hatch_time) + SSobj.processing.Remove(src) + for(var/mob/M in contents) + src.visible_message("[src] hatches!") + M.loc = src.loc + qdel(src) + +/obj/item/gland/plasma + cooldown_low = 1200 + cooldown_high = 2400 + uses = 1 + +/obj/item/gland/plasma/activate() + host << "You feel bloated." + sleep(150) + host << "Your stomach feels about to explode!" + sleep(50) + host.visible_message("[host] explodes in a cloud of plasma!") + var/turf/simulated/T = get_turf(host) + if(istype(T)) + T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C,300) + host.gib() + return \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/camera.dm b/code/game/gamemodes/abduction/machinery/camera.dm new file mode 100644 index 00000000000..52773d60e1a --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/camera.dm @@ -0,0 +1,142 @@ +/obj/machinery/computer/camera_advanced/abductor + name = "Human Observation Console" + var/team = 0 + networks = list("SS13","Abductor") + off_action = new/datum/action/camera_off/abductor //specific datum + var/datum/action/teleport_in/tele_in_action = new + var/datum/action/teleport_out/tele_out_action = new + var/datum/action/teleport_self/tele_self_action = new + var/datum/action/vest_mode_swap/vest_mode_action = new + var/datum/action/vest_disguise_swap/vest_disguise_action = new + var/obj/machinery/abductor/console/console + + icon = 'icons/obj/abductor.dmi' + icon_state = "camera" + +/obj/machinery/computer/camera_advanced/abductor/CreateEye() + ..() + eyeobj.visible_icon = 1 + eyeobj.icon = 'icons/obj/abductor.dmi' + eyeobj.icon_state = "camera_target" + +/obj/machinery/computer/camera_advanced/abductor/GrantActions(var/mob/living/carbon/user) + off_action.target = user + off_action.Grant(user) + + jump_action.target = user + jump_action.Grant(user) + //TODO : add null checks + tele_in_action.target = console.pad + tele_in_action.Grant(user) + + tele_out_action.target = console + tele_out_action.Grant(user) + + tele_self_action.target = console.pad + tele_self_action.Grant(user) + + vest_mode_action.target = console + vest_mode_action.Grant(user) + + vest_disguise_action.target = console + vest_disguise_action.Grant(user) + +/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + return H.dna.species.id == "abductor" + +/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + var/datum/species/abductor/S = H.dna.species + return S.scientist + +/obj/machinery/computer/camera_advanced/abductor/attack_hand(var/mob/user as mob) + if(!iscarbon(user) || !IsAbductor(user)) + return + return ..() + +/datum/action/camera_off/abductor/Activate() + if(!target || !iscarbon(target)) + return + var/mob/living/carbon/C = target + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/computer/camera_advanced/abductor/origin = remote_eye.origin + C.remote_view = 0 + origin.current_user = null + origin.jump_action.Remove(C) + origin.tele_in_action.Remove(C) + origin.tele_out_action.Remove(C) + origin.tele_self_action.Remove(C) + origin.vest_mode_action.Remove(C) + origin.vest_disguise_action.Remove(C) + if(C.client) + C.client.perspective = MOB_PERSPECTIVE + C.client.eye = src + C.client.images -= remote_eye.user_image + C.remote_control = null + C.unset_machine() + src.Remove(C) + + +/datum/action/teleport_in + name = "Send To" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_in/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.PadToLoc(remote_eye.loc) + +/datum/action/teleport_out + name = "Retrieve" + action_type = AB_INNATE + button_icon_state = "beam_up" + +/datum/action/teleport_out/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + + console.TeleporterRetrieve() + +/datum/action/teleport_self + name = "Send Self" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_self/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.MobToLoc(remote_eye.loc,C) + +/datum/action/vest_mode_swap + name = "Switch Vest Mode" + action_type = AB_INNATE + button_icon_state = "vest_mode" + +/datum/action/vest_mode_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.FlipVest() + + +/datum/action/vest_disguise_swap + name = "Switch Vest Disguise" + action_type = AB_INNATE + button_icon_state = "vest_disguise" + +/datum/action/vest_disguise_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.SelectDisguise(remote=1) diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm new file mode 100644 index 00000000000..bfaeefa3e2c --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -0,0 +1,184 @@ +//Common + +/obj/machinery/abductor + var/team = 0 + +/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + if(!H.dna) + return 0 + return H.dna.species.id == "abductor" + +/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.agent + return 0 + +/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.scientist + return 0 + +//Console + +/obj/machinery/abductor/console + name = "Abductor console" + desc = "Ship command center." + icon = 'icons/obj/abductor.dmi' + icon_state = "console" + density = 1 + anchored = 1.0 + var/obj/item/device/abductor/gizmo/gizmo + var/obj/item/clothing/suit/armor/abductor/vest/vest + var/obj/machinery/abductor/experiment/experiment + var/obj/machinery/abductor/pad/pad + var/obj/machinery/computer/camera_advanced/abductor/camera + var/list/datum/icon_snapshot/disguises = list() + +/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + user << "You start mashing alien buttons at random!" + if(do_after(user,100)) + TeleporterSend() + return + user.set_machine(src) + var/dat = "" + dat += "
Abductsoft 3000
" + + if(experiment != null) + var/points = experiment.points + dat += "Collected Samples : [points]" + else + dat += "NO EXPERIMENT MACHINE DETECTED
" + + if(pad!=null) + dat += "Emergency Teleporter System." + dat += "Consider using primary observation console first." + dat += "Activate Teleporter
" + dat += "Set Teleporter
" + if(gizmo!=null && gizmo.marked!=null) + dat += "Retrieve Mark
" + else + dat += "Retrieve Mark
" + else + dat += "NO TELEPAD DETECTED" + + if(vest!=null) + dat += "
Agent Vest Mode
" + var/mode = vest.mode + if(mode == VEST_STEALTH) + dat += "Combat" + dat += "Stealth" + else + dat += "Combat" + dat += "Stealth" + + dat+="
" + dat += "Select Agent Vest Disguise
" + else + dat += "NO AGENT VEST DETECTED" + var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/console/Topic(href, href_list) + if(..()) + return + + usr.set_machine(src) + if(href_list["teleporter_set"]) + TeleporterSet() + else if(href_list["teleporter_send"]) + TeleporterSend() + else if(href_list["teleporter_retrieve"]) + TeleporterRetrieve() + else if(href_list["flip_vest"]) + FlipVest() + else if(href_list["select_disguise"]) + SelectDisguise() + src.updateUsrDialog() + +/obj/machinery/abductor/console/proc/TeleporterSet() + var/A = null + A = input("Select area to teleport to", "Teleport", A) in teleportlocs + if(pad!=null && in_range(usr,src)) + pad.teleport_target = teleportlocs[A] + return + +/obj/machinery/abductor/console/proc/TeleporterRetrieve() + if(gizmo!=null && pad!=null && gizmo.marked) + pad.Retrieve(gizmo.marked) + return + +/obj/machinery/abductor/console/proc/TeleporterSend() + if(pad!=null) + pad.Send() + return + +/obj/machinery/abductor/console/proc/FlipVest() + if(vest!=null) + vest.flip_mode() + return + +/obj/machinery/abductor/console/proc/SelectDisguise(var/remote=0) + var/list/entries = list() + var/tempname + var/datum/icon_snapshot/temp + for(var/i = 1; i <= disguises.len; i++) + temp = disguises[i] + tempname = temp.name + entries["[tempname]"] = disguises[i] + var/entry_name = input( "Choose Disguise", "Disguise") in entries + var/datum/icon_snapshot/chosen = entries[entry_name] + if(chosen && (remote || in_range(usr,src))) + vest.SetDisguise(chosen) + return + +/obj/machinery/abductor/console/proc/Initialize() + + for(var/obj/machinery/abductor/pad/p in machines) + if(p.team == team) + pad = p + break + + for(var/obj/machinery/abductor/experiment/e in machines) + if(e.team == team) + experiment = e + e.console = src + + for(var/obj/machinery/computer/camera_advanced/abductor/c in machines) + if(c.team == team) + camera = c + c.console = src + +/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) + var/datum/icon_snapshot/entry = new + entry.name = target.name + entry.icon = target.icon + entry.icon_state = target.icon_state + entry.overlays = target.get_overlays_copy(list(L_HAND_LAYER,R_HAND_LAYER)) + for(var/i=1,i<=disguises.len,i++) + var/datum/icon_snapshot/temp = disguises[i] + if(temp.name == entry.name) + disguises[i] = entry + return + disguises.Add(entry) + return + +/obj/machinery/abductor/console/attackby(O as obj, user as mob, params) + if(istype(O, /obj/item/device/abductor/gizmo)) + var/obj/item/device/abductor/gizmo/G = O + user << "You link the tool to the console." + gizmo = G + G.console = src + else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest)) + var/obj/item/clothing/suit/armor/abductor/vest/V = O + user << "You link the vest to the console." + vest = V + else + ..() \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/dispenser.dm b/code/game/gamemodes/abduction/machinery/dispenser.dm new file mode 100644 index 00000000000..d346e0366a5 --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/dispenser.dm @@ -0,0 +1,82 @@ +/obj/machinery/abductor/gland_dispenser + name = "Replacement Organ Storage" + desc = "A tank filled with replacement organs" + icon = 'icons/obj/abductor.dmi' + icon_state = "dispenser" + density = 1 + anchored = 1 + var/list/gland_types + var/list/gland_colors + var/list/amounts + +/obj/machinery/abductor/gland_dispenser/proc/random_color() + //TODO : replace with presets or spectrum + return rgb(rand(0,255),rand(0,255),rand(0,255)) + +/obj/machinery/abductor/gland_dispenser/New() + gland_types = typesof(/obj/item/gland) - /obj/item/gland + gland_types = shuffle(gland_types) + gland_colors = new/list(gland_types.len) + amounts = new/list(gland_types.len) + for(var/i=1,i<=gland_types.len,i++) + gland_colors[i] = random_color() + amounts[i] = rand(1,5) + +/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + return + user.set_machine(src) + var/box_css = {" + "} + var/dat = "" + var/item_count = 0 + for(var/i=1,i<=gland_colors.len,i++) + item_count++ + var/g_color = gland_colors[i] + var/amount = amounts[i] + dat += "[amount]" + if(item_count == 3) // Three boxes per line + dat +="" + item_count = 0 + var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) + popup.add_head_content(box_css) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/gland)) + user.drop_item() + W.loc = src + for(var/i=1,i<=gland_colors.len,i++) + if(gland_types[i] == W.type) + amounts[i]++ + +/obj/machinery/abductor/gland_dispenser/Topic(href, href_list) + if(..()) + return + usr.set_machine(src) + + if(href_list["dispense"]) + Dispense(text2num(href_list["dispense"])) + src.updateUsrDialog() + +/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) + if(amounts[count]>0) + amounts[count]-- + var/T = gland_types[count] + new T(get_turf(src)) \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm new file mode 100644 index 00000000000..371011323df --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/experiment.dm @@ -0,0 +1,204 @@ +/obj/machinery/abductor/experiment + name = "Experimental machinery" + desc = "A human-sized coffin sporting wide array of automatic surgery tools" + icon = 'icons/obj/abductor.dmi' + icon_state = "experiment-open" + density = 0 + anchored = 1 + state_open = 1 + var/points = 0 + var/list/history = new + var/flash = " - || - " + var/obj/machinery/abductor/console/console + +/obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) + return + if(IsAbductor(target)) + return + close_machine(target) + +/obj/machinery/abductor/experiment/allow_drop() + return 0 + +/obj/machinery/abductor/experiment/attack_hand(mob/user) + if(..()) + return + + experimentUI(user) + +/obj/machinery/abductor/experiment/open_machine() + if(!state_open && !panel_open) + ..() + +/obj/machinery/abductor/experiment/close_machine(mob/target) + for(var/mob/living/carbon/C in loc) + if(IsAbductor(C)) + return + if(state_open && !panel_open) + ..(target) + +/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) + var/icon/photo = null + var/g = (H.gender == FEMALE) ? "f" : "m" + if(!config.mutant_races || H.dna.species.use_skintones) + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]_s") + else + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]_s") + photo.Blend("#[H.dna.mutant_color]", ICON_MULTIPLY) + + var/icon/eyes_s + if(EYECOLOR in H.dna.species.specflags) + eyes_s = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[H.dna.species.eyes]_s") + eyes_s.Blend("#[H.eye_color]", ICON_MULTIPLY) + + var/datum/sprite_accessory/S + S = hair_styles_list[H.hair_style] + if(S && (HAIR in H.dna.species.specflags)) + var/icon/hair_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + hair_s.Blend("#[H.hair_color]", ICON_MULTIPLY) + eyes_s.Blend(hair_s, ICON_OVERLAY) + + S = facial_hair_styles_list[H.facial_hair_style] + if(S && (FACEHAIR in H.dna.species.specflags)) + var/icon/facial_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + facial_s.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) + eyes_s.Blend(facial_s, ICON_OVERLAY) + + if(eyes_s) + photo.Blend(eyes_s, ICON_OVERLAY) + + var/icon/splat = icon("icon" = 'icons/mob/dam_human.dmi',"icon_state" = "chest30") + photo.Blend(splat,ICON_OVERLAY) + + return photo + +/obj/machinery/abductor/experiment/proc/experimentUI(mob/user) + var/dat + dat += "
Experiment
" + if(occupant) + var/obj/item/weapon/photo/P = new + P.photocreate(null, icon(dissection_icon(occupant), dir = SOUTH)) + user << browse_rsc(P.img, "dissection_img") + dat += "| "
+ dat += " | "
+ dat += "Probe " + dat += "Dissect " + dat += "Analyze " + dat += " |
Machine Unoccupied
" + else + dat += "Subject Status :
" + dat += "[occupant.name] => " + switch(occupant.stat) + if(0) + dat += "Conscious" + if(1) + dat += "Unconscious" + else + dat += "DEAD" + dat += "" + dat += "[flash]" + dat += "
" + dat += "Scan" + dat += "Close" : "open=1'>Open"]" + var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) + popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/abductor/experiment/Topic(href, href_list) + if(..() || usr == occupant) + return + usr.set_machine(src) + if(href_list["refresh"]) + updateUsrDialog() + return + if(href_list["open"]) + open_machine() + return + if(href_list["close"]) + close_machine() + return + if(occupant && occupant.stat != DEAD) + if(href_list["experiment"]) + flash = Experiment(occupant,href_list["experiment"]) + updateUsrDialog() + add_fingerprint(usr) + +/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) + var/mob/living/carbon/human/H = occupant + var/point_reward = 0 + if(H in history) + return "Specimen already in the database" + if(H.stat == DEAD) + say("Specimen deceased - please provide fresh sample.") + return "Specimen Deceased" + var/obj/item/gland/GlandTest = locate() in H + if(!GlandTest) + say("Experimental dissection not detected!") + return "No glands detected!" + if(H.mind != null || H.ckey != null) + history += H + say("Processing Specimen...") + sleep(5) + switch(text2num(type)) + if(1) + H << "You feel violated." + if(2) + H << "You feel being sliced and put back together." + if(3) + H << "You feel under intense scrutiny." + sleep(5) + H << "Your mind snaps!" + var/objtype = pick(typesof(/datum/objective/abductee/) - /datum/objective/abductee/) + var/datum/objective/abductee/O = new objtype() + H.mind.objectives += O + var/obj_count = 1 + H << "Your current objectives:" + for(var/datum/objective/objective in H.mind.objectives) + H << "Objective #[obj_count]: [objective.explanation_text]" + obj_count++ + + for(var/obj/item/gland/G in H) + G.Start() + point_reward++ + if(point_reward > 0) + open_machine() + SendBack(H) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + points += point_reward + return "Experiment Successfull! [point_reward] new data-points collected." + else + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + return "Experiment Failed! No replacement organ detected." + else + say("Brain Activity Nonexistant - Disposing Sample...") + open_machine() + SendBack(H) + return "Specimen Braindead - Disposed" + return "ERROR" + + +/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) + H.Sleeping(8) + var/area/A + if(console && console.pad && console.pad.teleport_target) + A = console.pad.teleport_target + else + A = teleportlocs[pick(teleportlocs)] + TeleportToArea(H,A) + +/obj/machinery/abductor/experiment/update_icon() + if(state_open) + icon_state = "experiment-open" + else + icon_state = "experiment" + +/obj/machinery/abductor/experiment/say_quote(text) + return "beeps, \"[text]\"" \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/pad.dm b/code/game/gamemodes/abduction/machinery/pad.dm new file mode 100644 index 00000000000..081f746a085 --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/pad.dm @@ -0,0 +1,86 @@ +/obj/machinery/abductor/pad + name = "Alien Telepad" + desc = "Use this to transport to and from human habitat" + icon = 'icons/obj/abductor.dmi' + icon_state = "alien-pad-idle" + anchored = 1 + var/area/teleport_target + +/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + if(!T.density) + var/clear = 1 + for(var/obj/O in T) + if(O.density) + clear = 0 + break + if(clear) + L+=T + if(!L.len) + return + + if(target && target.buckled) + target.buckled.unbuckle_mob() + + var/list/tempL = L + var/attempt = null + var/success = 0 + while(tempL.len) + attempt = pick(tempL) + target.Move(attempt) + if(get_turf(target) == attempt) + success = 1 + break + else + tempL.Remove(attempt) + if(!success) + target.loc = pick(L) + +/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) + target.Move(src.loc) + +/obj/machinery/abductor/pad/proc/Send() + if(teleport_target == null) + teleport_target = teleportlocs[pick(teleportlocs)] + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + TeleportToArea(target,teleport_target) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/carbon/human/target) + flick("alien-pad", src) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + Warp(target) + +/obj/machinery/abductor/pad/proc/MobToLoc(var/place,var/mob/living/target) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + target.forceMove(place) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/PadToLoc(var/place) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + target.forceMove(place) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + + +/obj/effect/teleport_abductor + name = "Huh" + icon = 'icons/obj/abductor.dmi' + icon_state = "teleport" diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 207805d235b..ded9ed324f2 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -15,6 +15,7 @@ var/list/blob_nodes = list() required_enemies = 1 recommended_enemies = 1 + round_ends_with_antag_death = 1 restricted_jobs = list("Cyborg", "AI") var/declared = 0 diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index aec57627778..c0987cabce1 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -1,8 +1,4 @@ /datum/game_mode/blob/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted) - return ..() if(infected_crew.len > burst)//Some blobs have yet to burst return 0 if(blobwincount <= blobs.len)//Blob took over @@ -14,11 +10,6 @@ SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") - - if(config.midround_antag["blob"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() return 1 if(station_was_nuked)//Nuke went off diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 43c17da6211..e9d0eb6217c 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -2,7 +2,7 @@ /mob/camera/blob/proc/can_buy(var/cost = 15) if(blob_points < cost) - src << "You cannot afford this." + src << "You cannot afford this!" return 0 add_points(-cost) return 1 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 17e34ff67e9..c8d581d08e9 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -88,9 +88,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" if(character.client.prefs.be_special & BE_CHANGELING) if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) - if(!(character.job in ticker.mode.restricted_jobs)) + if(!(character.job in restricted_jobs)) character.mind.make_Changling() - ..() /datum/game_mode/proc/forge_changeling_objectives(var/datum/mind/changeling) //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 081db162a22..913b6dd295d 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -17,10 +17,10 @@ var/obj/item/weapon/grab/G = user.get_active_hand() if(!istype(G)) - user << "We must be grabbing a creature in our active hand to absorb them." + user << "We must be grabbing a creature in our active hand to absorb them!" return if(G.state <= GRAB_NECK) - user << "We must have a tighter grip to absorb this creature." + user << "We must have a tighter grip to absorb this creature!" return var/mob/living/carbon/target = G.affecting @@ -38,12 +38,10 @@ if(1) user << "This creature is compatible. We must hold still..." if(2) - user << "We extend a proboscis." - user.visible_message("[user] extends a proboscis!") + user.visible_message("[user] extends a proboscis!", "We extend a proboscis.") if(3) - user << "We stab [target] with the proboscis." - user.visible_message("[user] stabs [target] with the proboscis!") - target << "You feel a sharp stabbing pain!" + user.visible_message("[user] stabs [target] with the proboscis!", "We stab [target] with the proboscis.") + target << "You feel a sharp stabbing pain!" target.take_overall_damage(40) feedback_add_details("changeling_powers","A[stage]") @@ -52,9 +50,8 @@ changeling.isabsorbing = 0 return - user << "We have absorbed [target]!" - user.visible_message("[user] sucks the fluids from [target]!") - target << "You have been absorbed by the changeling!" + user.visible_message("[user] sucks the fluids from [target]!", "We have absorbed [target].") + target << "You are absorbed by the changeling!" if(!changeling.has_dna(target.dna)) changeling.absorb_dna(target, user) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index eb77d14ef3d..c96fc387697 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -23,19 +23,19 @@ /obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target) if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh qdel(user.l_hand) - user.visible_message("With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!" return var/obj/item/W = new weapon_type(user) user.put_in_hands(W) @@ -64,7 +64,7 @@ var/mob/living/carbon/human/H = user if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type)) - H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!") + H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!") qdel(H.wear_suit) qdel(H.head) H.update_inv_wear_suit() @@ -133,10 +133,10 @@ /obj/item/weapon/melee/arm_blade/New() ..() if(ismob(loc)) - loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") + loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") /obj/item/weapon/melee/arm_blade/dropped(mob/user) - user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "", "We assimilate the blade back into our body.", "The airlock's motors resist our efforts to force it." + user << "The airlock's motors resist our efforts to force it!" return else if(A.locked) - user << "The airlock's bolts prevent it from being forced." + user << "The airlock's bolts prevent it from being forced!" return else //user.say("Heeeeeeeeeerrre's Johnny!") - user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.") + user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.") A.open(1) @@ -207,7 +207,7 @@ /obj/item/weapon/melee/shield/New() ..() if(ismob(loc)) - loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") + loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") /obj/item/clothing/head/helmet/space/changeling/dropped() qdel(src) @@ -216,7 +216,7 @@ if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "", "We assimilate our shield into our body", "", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") + loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") SSobj.processing += src /obj/item/clothing/suit/space/changeling/dropped() @@ -312,7 +312,7 @@ /obj/item/clothing/suit/armor/changeling/New() ..() if(ismob(loc)) - loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!") + loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!") /obj/item/clothing/suit/armor/changeling/dropped() qdel(src) diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 292cbe9d52a..25960b275f3 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -73,6 +73,6 @@ if(character.client.prefs.be_special & BE_CHANGELING) if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) - if(!(character.job in ticker.mode.restricted_jobs)) + if(!(character.job in restricted_jobs)) character.mind.make_Changling() ..() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 32ae9b5a7e0..ac159322699 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -42,7 +42,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return if(ishuman(usr) || ismonkey(usr)) //Damage only applies to humans and monkeys, to allow constructs to communicate - usr.visible_message("[usr.name] starts clawing at his arms like a mad man!") + usr.visible_message("[usr.name] starts clawing at his arms like a mad man!", "You start clawing at his arms like a mad man!") apply_damage(25,BRUTE, "l_arm") apply_damage(25,BRUTE, "r_arm") sleep(50) @@ -55,7 +55,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", apply_damage(15,BRUTE, "r_arm") if(usr.incapacitated()) return - usr.visible_message("[usr.name] paints strange symbols with their own blood") + usr.visible_message("[usr.name] paints strange symbols with their own blood.", "You paint strange symbols with your own blood.") sleep(20) usr.say("O bidai nabora se[pick("'","`")]sma!") @@ -164,9 +164,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/attack_hand(mob/living/user as mob) // OH GOD this is horrible if(!iscultist(user)) - user << "You can't mouth the arcane scratchings without fumbling over them." + user << "You can't mouth the arcane scratchings without fumbling over them!" return - var/message = "You are unable to speak the words of the rune." + var/message = "You are unable to speak the words of the rune!" if(!user.can_speak(message) && (user.mind && !user.mind.miming)) user << message return @@ -236,7 +236,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", cultist.say(gibberish) else cultist.whisper(gibberish) - visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2) + visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2) return /obj/effect/rune/proc/check_icon() @@ -637,8 +637,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return for (var/mob/V in viewers(src)) - V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) - user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." + V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) + user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage if(do_after(user, 50)) if(usr.get_active_hand() != src) @@ -670,7 +670,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // if(M == user) for(var/entry in words) words[entry] = T.words[entry] - user << "You copy the translation notes from your tome." + user << "You copy the translation notes from your tome." /obj/item/weapon/tome/examine(mob/user) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index babeb58ab51..340aa519ba5 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -26,8 +26,8 @@ var/list/sacrificed = list() else user.whisper("Sas[pick("'","`")]so c'arta forbici!") user.visible_message("[user] disappears in a flash of red light!", \ - "You feel as your body gets dragged through the dimension of Nar-Sie!", \ - "You hear a sickening crunch and sloshing of viscera.") + "You feel as your body gets dragged through the dimension of Nar-Sie!", \ + "You hear a sickening crunch and sloshing of viscera.") user.loc = allrunesloc[rand(1,index)] return if(istype(src,/obj/effect/rune)) @@ -53,7 +53,7 @@ var/list/sacrificed = list() IP = R runecount++ if(runecount >= 2) - user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric" + user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric" if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -85,7 +85,7 @@ var/list/sacrificed = list() usr.whisper("N[pick("'","`")]ath reth sh'yro eth d'raggathnor!") usr.visible_message("Rune disappears with a flash of red light, and in its place now a book lies.", \ "You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \ - "You hear a pop and smell ozone.") + "You hear a pop and smell ozone.") if(istype(src,/obj/effect/rune)) new /obj/item/weapon/tome(src.loc) else @@ -110,8 +110,8 @@ var/list/sacrificed = list() C.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!") if(cultsinrange.len >= 3) M.visible_message("[M] writhes in pain as the markings below him glow a bloody red.", \ - "AAAAAAHHHH!", \ - "You hear an anguished scream.") + "AAAAAAHHHH!", \ + "You hear an anguished scream.") if(is_convertable_to_cult(M.mind)) ticker.mode.add_cultist(M.mind) M.mind.special_role = "Cultist" @@ -221,14 +221,14 @@ var/list/sacrificed = list() usr.say ("Yu[pick("'","`")]gular faras desdae. Havas mithum javara. Umathar uf'kal thenar!") usr.visible_message("Blood flows from the rune into [usr]!", \ "The blood starts flowing from the rune and into your frail mortal body. You feel... empowered.", \ - "You hear a liquid flowing.") + "You hear a liquid flowing.") var/mob/living/user = usr if(user.bhunger) user.bhunger = max(user.bhunger-2*drain,0) if(drain>=50) user.visible_message("[user]'s eyes give off eerie red glow!", \ "...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within.", \ - "You hear a heartbeat.") + "You hear a heartbeat.") user.bhunger += drain src = user spawn() @@ -341,10 +341,10 @@ var/list/sacrificed = list() usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!") corpse_to_raise.visible_message("[corpse_to_raise]'s eyes glow with a faint red as he stands up, slowly starting to breathe again.", \ "Life... I'm alive again...", \ - "You hear a faint, slightly familiar whisper.") + "You hear a faint, slightly familiar whisper.") body_to_sacrifice.visible_message("[body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from his remains!", \ "You feel as your blood boils, tearing you apart.", \ - "You hear a thousand voices, all crying in pain.") + "You hear a thousand voices, all crying in pain.") body_to_sacrifice.gib() // if(ticker.mode.name == "cult") @@ -396,7 +396,7 @@ var/list/sacrificed = list() usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!") usr.visible_message("[usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \ "The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \ - "You hear only complete silence for a moment.") + "You hear only complete silence for a moment.") usr.ghostize(1) L.ajourn = 1 while(L) @@ -431,7 +431,7 @@ var/list/sacrificed = list() var/mob/living/carbon/human/dummy/D = new(this_rune.loc) usr.visible_message("A shape forms in the center of the rune. A shape of... a man.", \ "A shape forms in the center of the rune. A shape of... a man.", \ - "You hear liquid flowing.") + "You hear liquid flowing.") D.real_name = "[pick(first_names_male)] [pick(last_names)]" D.status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH @@ -453,7 +453,7 @@ var/list/sacrificed = list() if(D) D.visible_message("[D] slowly dissipates into dust and bones.", \ "You feel pain, as bonds formed between your soul and this homunculus break.", \ - "You hear faint rustle.") + "You hear faint rustle.") D.dust() return @@ -552,7 +552,7 @@ var/list/sacrificed = list() runedec+=10 user.visible_message("[user] keels over dead, his blood glowing blue as it escapes his body and dissipates into thin air.", \ "In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood.", \ - "You hear faint rustle.") + "You hear faint rustle.") for(,user.stat==2) sleep(600) if (!user) @@ -877,7 +877,7 @@ var/list/sacrificed = list() C.take_overall_damage(25, 0) user.visible_message("Rune disappears with a flash of red light, and in its place now a body lies.", \ "You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \ - "You hear a pop and smell ozone.") + "You hear a pop and smell ozone.") qdel(src) return fizzle(user) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2e3654f7b6a..5a98fc04f0a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -19,6 +19,7 @@ var/probability = 1 var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm var/explosion_in_progress = 0 //sit back and relax + var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such var/list/datum/mind/modePlayer = new var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist @@ -29,6 +30,7 @@ var/pre_setup_before_jobs = 0 var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag var/datum/mind/sacrifice_target = null + var/mob/living/living_antag_player = null var/list/datum/game_mode/replacementmode = null var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted var/reroll_friendly //During mode conversion only these are in the running @@ -97,16 +99,16 @@ ///convert_roundtype() ///Allows rounds to basically be "rerolled" should the initial premise fall through /datum/game_mode/proc/convert_roundtype() - var/living_crew = 0 + var/list/living_crew = list() for(var/mob/Player in mob_list) if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player)) - living_crew++ - if(living_crew / joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh + living_crew += Player + if(living_crew.len / joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew") return null - var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew) + var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len) var/list/datum/game_mode/usable_modes = list() for(var/datum/game_mode/G in runnable_modes) if(G.reroll_friendly) @@ -167,12 +169,72 @@ /datum/game_mode/proc/check_finished() //to be called by ticker + if(replacementmode && round_converted == 2) + return replacementmode.check_finished() if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) return 1 + if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags + if(living_antag_player && living_antag_player.mind && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player)) + return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark. + + for(var/mob/living/Player in living_mob_list) + if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player)) + if(Player.mind.special_role) //Someone's still antaging! + living_antag_player = Player + return 0 + + if(!config.continuous[config_tag]) + return 1 + + else + round_converted = convert_roundtype() + if(!round_converted) + if(round_ends_with_antag_death) + return 1 + else + config.midround_antag[config_tag] = 0 + return 0 + return 0 /datum/game_mode/proc/declare_completion() + var/clients = 0 + var/surviving_humans = 0 + var/surviving_total = 0 + var/ghosts = 0 + var/escaped_humans = 0 + var/escaped_total = 0 + + for(var/mob/M in player_list) + if(M.client) + clients++ + if(ishuman(M)) + if(!M.stat) + surviving_humans++ + if(M.z == 2) + escaped_humans++ + if(!M.stat) + surviving_total++ + if(M.z == 2) + escaped_total++ + + + if(isobserver(M)) + ghosts++ + + if(clients > 0) + feedback_set("round_end_clients",clients) + if(ghosts > 0) + feedback_set("round_end_ghosts",ghosts) + if(surviving_humans > 0) + feedback_set("survived_human",surviving_humans) + if(surviving_total > 0) + feedback_set("survived_total",surviving_total) + if(escaped_humans > 0) + feedback_set("escaped_human",escaped_humans) + if(escaped_total > 0) + feedback_set("escaped_total",escaped_total) send2irc("Server", "Round just ended.") return 0 diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 1432c50efd7..4b5fed604e8 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -11,6 +11,10 @@ var/datum/gang_points/gang_points var/list/A_territory = list() var/list/B_territory = list() + var/list/A_territory_new = list() + var/list/A_territory_lost = list() + var/list/B_territory_new = list() + var/list/B_territory_lost = list() /datum/game_mode/gang name = "gang war" @@ -21,15 +25,15 @@ required_enemies = 2 recommended_enemies = 2 enemy_minimum_age = 14 - var/finished = 0 - var/checkwin_counter = 0 + var/goal_scalar = 0.6 //Goal = Total territories x goal_scalar + /////////////////////////// //Announces the game type// /////////////////////////// /datum/game_mode/gang/announce() world << "The current game mode is - Gang War!" - world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by claiming more than half of the station!
Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!" + world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by claiming more than [round(100*goal_scalar,1)]% of the station!
Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!" /////////////////////////////////////////////////////////////////////////////// @@ -74,15 +78,6 @@ modePlayer += B_bosses ..() - -/datum/game_mode/gang/process() - checkwin_counter++ - if(checkwin_counter >= 5) - if(!finished) - ticker.mode.check_win() - checkwin_counter = 0 - return 0 - /datum/game_mode/gang/proc/assign_bosses() var/datum/mind/boss = pick(antag_candidates) A_bosses += boss @@ -99,7 +94,7 @@ /datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind - rival_obj.explanation_text = "Claim more than half the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." + rival_obj.explanation_text = "Claim more than 60% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." boss_mind.objectives += rival_obj @@ -167,9 +162,9 @@ //Checks if the either gang have won or not// ///////////////////////////////////////////// /datum/game_mode/gang/check_win() - if(A_territory.len > (start_state.num_territories / 2)) + if(A_territory.len > (start_state.num_territories * goal_scalar)) finished = "A" //Gang A wins - else if(B_territory.len > (start_state.num_territories / 2)) + else if(B_territory.len > (start_state.num_territories * goal_scalar)) finished = "B" //Gang B wins /////////////////////////////// @@ -186,7 +181,7 @@ /datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, var/gang, var/check = 1) if(check && isloyal(gangster_mind.current)) //Check to see if the potential gangster is implanted return 0 - if((gangster_mind in A_bosses) || (gangster_mind in A_gang) || (gangster_mind in B_bosses) || (gangster_mind in B_gang)) + if(gangster_mind in (A_bosses | A_gang | B_bosses | B_gang)) return 0 if(gang == "A") A_gang += gangster_mind @@ -305,7 +300,7 @@ if(A_bosses.len || A_gang.len) if(winner) - world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [round((ticker.mode.A_territory.len/start_state.num_territories)*100, 0.1)]% control of the station!" + world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)]% control of the station!" world << "
The [gang_name("A")] Gang Bosses were:" gang_membership_report(A_bosses) world << "
The [gang_name("A")] Gangsters were:" @@ -314,7 +309,7 @@ if(B_bosses.len || B_gang.len) if(winner) - world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [round((ticker.mode.B_territory.len/start_state.num_territories)*100, 0.1)]% control of the station!" + world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)]% control of the station!" world << "
The [gang_name("B")] Gang Bosses were:" gang_membership_report(B_bosses) world << "
The [gang_name("B")] Gangsters were:" @@ -341,9 +336,9 @@ world << text -////////////////////////////////// -//Handles gang points and income// -////////////////////////////////// +////////////////////////////////////////////////////////// +//Handles influence, territories, and the victory checks// +////////////////////////////////////////////////////////// /datum/gang_points var/A = 30 @@ -356,24 +351,94 @@ income() /datum/gang_points/proc/income() - var/A_new = min(100,(A + 10 + ticker.mode.A_territory.len)) + var/A_added_names = "" + var/B_added_names = "" + var/A_lost_names = "" + var/B_lost_names = "" + + //Process lost territories + for(var/area in ticker.mode.A_territory_lost) + if(A_lost_names == "") + A_lost_names += ":
" + else + A_lost_names += ", " + A_lost_names += "[ticker.mode.A_territory_lost[area]], " + ticker.mode.A_territory -= area + + for(var/area in ticker.mode.B_territory_lost) + if(B_lost_names == "") + B_lost_names += ":
" + else + B_lost_names += ", " + B_lost_names += "[ticker.mode.B_territory_lost[area]], " + ticker.mode.B_territory -= area + + //Calculate and report influence growth + ticker.mode.message_gangtools(ticker.mode.A_tools,"[gang_name("A")] Gang Status Report:") + var/A_new = min(100,A + 15 + min(ticker.mode.A_territory.len, 15) + round(max(ticker.mode.A_territory.len - 15, 0) * 0.5,1)) var/A_message = "" if(A_new != A) - A_message += "Your gang has gained [A_new - A] Influence from their presence on station." + A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories." if(A_new == 100) A_message += "Maximum influence reached." A = A_new - ticker.mode.message_gangtools(ticker.mode.A_tools,A_message) + ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0) - var/B_new = min(100,(B + 10 + ticker.mode.B_territory.len)) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[gang_name("B")] Gang Status Report:") + var/B_new = min(100,B + 15 + min(ticker.mode.B_territory.len, 15) + round(max(ticker.mode.B_territory.len - 15, 0) * 0.5,1)) var/B_message = "" if(B_new != B) - B_message += "Your gang has collected [B_new - B] Influence from their presence on station. " + B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories." if(B_new == 100) B_message += "Maximum influence reached." B = B_new - ticker.mode.message_gangtools(ticker.mode.B_tools,B_message) + ticker.mode.message_gangtools(ticker.mode.B_tools,B_message,0) + + //Remove territories they already own from the buffer, so if they got tagged over, they can still earn income if they tag it back before the next status report + ticker.mode.A_territory_new -= ticker.mode.A_territory + ticker.mode.B_territory_new -= ticker.mode.B_territory + + //Process new territories + for(var/area in ticker.mode.A_territory_new) + if(A_added_names == "") + A_added_names += ":
" + else + A_added_names += ", " + A_added_names += "[ticker.mode.A_territory_new[area]]" + ticker.mode.A_territory += area + + for(var/area in ticker.mode.B_territory_new) + if(B_added_names == "") + B_added_names += ":
" + else + B_added_names += ", " + B_added_names += "[ticker.mode.B_territory_new[area]]" + ticker.mode.B_territory += area + + //Report territory changes + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_new.len] new territories[A_added_names]",0) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_new.len] new territories[B_added_names]",0,) + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_lost.len] territories lost[A_lost_names]",0,1) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_lost.len] territories lost[B_lost_names]",0,1) + + //Clear the lists + ticker.mode.A_territory_new = list() + ticker.mode.B_territory_new = list() + ticker.mode.A_territory_lost = list() + ticker.mode.B_territory_lost = list() + + var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1) + var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1) + ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has [A_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.A_tools),"The [gang_name("B")] Gang has [B_control]% control of the station.",0,1) + ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has [B_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.B_tools),"The [gang_name("A")] Gang has [A_control]% control of the station.",0,1) + + //Victory check + ticker.mode.check_win() + + //Restart the counter start() @@ -381,13 +446,13 @@ //Sends a message to the boss via his gangtool// //////////////////////////////////////////////// -/datum/game_mode/proc/message_gangtools(var/list/gangtools,var/message,var/beeps=1) +/datum/game_mode/proc/message_gangtools(var/list/gangtools,var/message,var/beep=1,var/warning) if(!gangtools.len || !message) return for(var/obj/item/device/gangtool/tool in gangtools) var/mob/living/mob = get(tool.loc,/mob/living) if(mob && mob.mind) if(((tool.gang == "A") && ((mob.mind in A_gang) || (mob.mind in A_bosses))) || ((tool.gang == "B") && ((mob.mind in B_gang) || (mob.mind in B_bosses)))) - mob << "\icon[tool] [message]" - if(beeps) + mob << "\icon[tool] [message]" + if(beep) playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) \ No newline at end of file diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 81ed244f086..e392f101ae7 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -228,9 +228,9 @@ */ /datum/intercept_text/proc/build_gang(datum/mind/correct_person) - src.text += "
Syndicate forces may be supplying opposing criminal organizations within your sector in an attempt at destabilizing our operations." - src.text += "Ensure law and order is maintained on the station and be on the lookout for violent confrontations between station factions." - src.text += "Central Command retains an interest in any criminal leaders captured by station security. The execution or exile of these persons are ill-advised." + src.text += "
We have recieved reports of a sudden increase of criminal activity in close proximity to our operations within your sector." + src.text += "Ensure law and order is maintained on the station and be on the lookout for unusually territorial behavior from the crew." + src.text += "In the event of a full-scale takeover attempt, sensitive research items are to be secured and the station evacuated ASAP." src.text += "
" /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5e5aa1bf462..b5576eab127 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -227,7 +227,7 @@ for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) overload.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Overloading machine circuitry..." spawn(50) if(M) @@ -257,7 +257,7 @@ for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Reprogramming machine behaviour..." spawn(50) if(M && !M.gc_destroyed) @@ -426,11 +426,11 @@ if(upgraded) UC.uses -- C.visible_message("\icon[C] *beep*") - src << "Camera successully upgraded!" + src << "You successully upgrade the camera." else - src << "This camera is already upgraded!" + src << "This camera is already upgraded!" else - src << "Out of uses." + src << "Out of uses!" /datum/module_picker var/temp = null diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 7271875daee..1531ac36613 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -10,7 +10,7 @@ recommended_enemies = 1 pre_setup_before_jobs = 1 enemy_minimum_age = 30 //Same as AI minimum age - + round_ends_with_antag_death = 1 var/AI_win_timeleft = 5400 //started at 5400, in case I change this for testing round end. var/malf_mode_declared = 0 @@ -170,10 +170,6 @@ /datum/game_mode/malfunction/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted == 1) //No reason to waste resources - return ..() //Check for evacuation/nuke if (station_captured && !to_nuke_or_not_to_nuke) return 1 if (is_malf_ai_dead() || !check_ai_loc()) @@ -186,10 +182,6 @@ malf_mode_declared = 0 if(get_security_level() == "delta") set_security_level("red") - if(config.midround_antag["malfunction"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() else return 1 diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index d61191f9334..74e88d79bad 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -122,7 +122,7 @@ location = locate(locationx,locationy,Z.z) - usr << "You set the pinpointer to locate [locationx],[locationy]" + usr << "You set the pinpointer to locate [locationx],[locationy]" return attack_self() @@ -140,9 +140,9 @@ return target=locate(possible_items[targetitem]) if(!target) - usr << "Failed to locate [targetitem]!" + usr << "Failed to locate [targetitem]!" return - usr << "You set the pinpointer to locate [targetitem]" + usr << "You set the pinpointer to locate [targetitem]." if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 553df633bf8..025c55c3532 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -187,14 +187,19 @@ /////////////////////////////// /datum/game_mode/revolution/proc/latejoin_headrev() if(revolutionaries) //Head Revs are not in this list - var/datum/mind/stalin = pick(revolutionaries) - revolutionaries -= stalin - head_revolutionaries += stalin - log_game("[stalin.key] (ckey) has been promoted to a head rev") - equip_revolutionary(stalin.current) - forge_revolutionary_objectives(stalin) - greet_revolutionary(stalin) - ++max_headrevs + var/list/promotable_revs = list() + for(var/datum/mind/khrushchev in revolutionaries) + if(khrushchev.current && khrushchev.current.client && khrushchev.current.stat != DEAD) + if(khrushchev.current.client.prefs.be_special & BE_REV) + promotable_revs += khrushchev + if(promotable_revs) + var/datum/mind/stalin = pick(promotable_revs) + revolutionaries -= stalin + head_revolutionaries += stalin + log_game("[stalin.key] (ckey) has been promoted to a head rev") + equip_revolutionary(stalin.current) + forge_revolutionary_objectives(stalin) + greet_revolutionary(stalin) ////////////////////////////////////// //Checks if the revs have won or not// @@ -213,11 +218,15 @@ if(config.continuous["revolution"]) if(finished != 0) SSshuttle.emergencyNoEscape = 0 + if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) + SSshuttle.emergency.mode = SHUTTLE_DOCKED + SSshuttle.emergency.timer = world.time + priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") return ..() if(finished != 0) return 1 else - return 0 + return ..() /////////////////////////////////////////////////// //Deals with converting players to the revolution// diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 372ee45ff10..902a17c4a14 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -157,28 +157,6 @@ Made by Xhuis new_thrall_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind return 1 - - -/* - GAME FINISH CHECKS -*/ - - -/datum/game_mode/shadowling/check_finished() - var/shadows_alive = 0 //and then shadowling was kill - for(var/datum/mind/shadow in shadows) //but what if shadowling was not kill? - if(!istype(shadow.current,/mob/living/carbon/human) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling)) - continue - if(shadow.current.stat == DEAD) - continue - shadows_alive++ - if(shadows_alive) - return ..() - else - shadowling_dead = 1 //but shadowling was kill :( - return 1 - - /datum/game_mode/shadowling/proc/check_shadow_victory() var/success = 0 //Did they win? if(shadow_objectives.Find("enthrall")) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index af52f87a109..37e40099e0b 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -81,9 +81,8 @@ if(character.client.prefs.be_special & BE_TRAITOR) if(!jobban_isbanned(character.client, "traitor") && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) - if(!(character.job in ticker.mode.restricted_jobs)) + if(!(character.job in restricted_jobs)) add_latejoin_traitor(character.mind) - ..() /datum/game_mode/traitor/proc/add_latejoin_traitor(var/datum/mind/character) character.make_Traitor() diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index d0d350d86d7..6f19d7cdd0d 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -60,7 +60,7 @@ else if(mages_made >= max_mages) finished = 1 - return 1 + return ..() else make_more_mages() return ..() diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 138a77305c1..3d30ba9e242 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -18,9 +18,9 @@ if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now." + user << "The contract has been used, you can't get your points back now!" else - user << "You feed the contract back into the spellbook, refunding your points." + user << "You feed the contract back into the spellbook, refunding your points." src.max_uses++ src.uses++ qdel(O) @@ -30,11 +30,11 @@ /obj/item/weapon/spellbook/attack_self(mob/user as mob) if(!owner) - user << "You bind the spellbook to yourself." + user << "You bind the spellbook to yourself." owner = user return if(user != owner) - user << "The [name] does not recognize you as it's owner and refuses to open." + user << "The [name] does not recognize you as it's owner and refuses to open!" return user.set_machine(src) var/dat diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index ddce2321c47..1d2d5d5a98f 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -10,6 +10,7 @@ recommended_enemies = 1 pre_setup_before_jobs = 1 enemy_minimum_age = 14 + round_ends_with_antag_death = 1 var/use_huds = 0 var/finished = 0 @@ -171,37 +172,16 @@ /datum/game_mode/wizard/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - - if(round_converted == 1 || !wizards) //No reason to waste resources - return ..() //Check for evacuation/nuke - for(var/datum/mind/wizard in wizards) if(!wizard.current) continue if(wizard.current.stat != DEAD) return ..() - for(var/datum/mind/traitor in traitors) - if(!traitor.current) - continue - if(traitor.current.stat != DEAD) - return ..() - - if(!config.continuous["wizard"]) - return 1 - if(SSevent.wizardmode) //If summon events was active, turn it off SSevent.toggleWizardmode() SSevent.resetFrequency() - if(config.midround_antag["wizard"]) - round_converted = convert_roundtype() - if(!round_converted) - finished = 1 - return 1 - return ..() /datum/game_mode/wizard/declare_completion() diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index bb9d5db7eee..c563482d147 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -43,7 +43,7 @@ /obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/device/pda)) if(storedpda) - user << "There is already a PDA inside." + user << "There is already a PDA inside!" return else var/obj/item/device/pda/P = usr.get_active_hand() diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 386c11d09c9..82d9841d328 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -36,7 +36,7 @@ else // trying to unlock the interface if (src.allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the device." + user << "You [ locked ? "lock" : "unlock"] the device." if (locked) if (user.machine==src) user.unset_machine() diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ce624c2abc7..0b11e742401 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -804,7 +804,7 @@ table tr:first-child th:first-child { border: none;} if(2) if(istype(W, /obj/item/weapon/wirecutters) && panel_open && (wires.wires_status == 27 || wires.wires_status == 31)) //this checks for all wires to be cut, except the syphon wire which is optional. playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You cut the final wires." + user << "You cut the final wires." var/obj/item/stack/cable_coil/cable = new /obj/item/stack/cable_coil( src.loc ) cable.amount = 5 buildstage = 1 @@ -814,7 +814,7 @@ table tr:first-child th:first-child { border: none;} if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up. playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "The wires have been [panel_open ? "exposed" : "unexposed"]" + user << "The wires have been [panel_open ? "exposed" : "unexposed"]." update_icon() return @@ -822,19 +822,19 @@ table tr:first-child th:first-child { border: none;} return src.attack_hand(user) else if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card if(stat & (NOPOWER|BROKEN)) - user << "It does nothing" + user << "It does nothing!" else if(src.allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the Air Alarm interface." + user << "You [ locked ? "lock" : "unlock"] the air alarm interface." src.updateUsrDialog() else - user << "Access denied." + user << "Access denied." return if(1) if(istype(W, /obj/item/weapon/crowbar)) - user.visible_message("[user.name] removes the electronics from [src.name].",\ - "You start prying out the circuit.") + user.visible_message("[user.name] removes the electronics from [src.name].",\ + "You start prying out the circuit...") playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if (do_after(user, 20)) if (buildstage == 1) @@ -848,10 +848,10 @@ table tr:first-child th:first-child { border: none;} if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/cable = W if(cable.get_amount() < 5) - user << "You need five lengths of cable to wire the fire alarm." + user << "You need five lengths of cable to wire the fire alarm!" return - user.visible_message("[user.name] wires the air alarm.", \ - "You start wiring the air alarm.") + user.visible_message("[user.name] wires the air alarm.", \ + "You start wiring the air alarm...") if (do_after(user, 20)) if (cable.get_amount() >= 5 && buildstage == 1) cable.use(5) @@ -867,7 +867,7 @@ table tr:first-child th:first-child { border: none;} return if(0) if(istype(W, /obj/item/weapon/airalarm_electronics)) - user << "You insert the circuit!" + user << "You insert the circuit." buildstage = 1 update_icon() user.drop_item() @@ -875,7 +875,7 @@ table tr:first-child th:first-child { border: none;} return if(istype(W, /obj/item/weapon/wrench)) - user << "You detach \the [src] from the wall!" + user << "You detach \the [src] from the wall." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/alarm_frame( user.loc ) qdel(src) @@ -896,7 +896,7 @@ table tr:first-child th:first-child { border: none;} /obj/machinery/alarm/emag_act(mob/user as mob) if(!emagged) src.emagged = 1 - user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") + user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) return @@ -945,10 +945,10 @@ Code shamelessly copied from apc_frame var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "Air Alarm cannot be placed on this spot." + usr << "Air Alarm cannot be placed on this spot!" return if (A.requires_power == 0 || A.name == "Space") - usr << "Air Alarm cannot be placed in this area." + usr << "Air Alarm cannot be placed in this area!" return if(gotwallitem(loc, ndir)) @@ -1025,7 +1025,7 @@ FIRE ALARM /obj/machinery/firealarm/emag_act(mob/user as mob) if(!emagged) src.emagged = 1 - user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.") + user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.") playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) return @@ -1056,7 +1056,7 @@ FIRE ALARM if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "The wires have been [panel_open ? "exposed" : "unexposed"]" + user << "The wires have been [panel_open ? "exposed" : "unexposed"]." update_icon() return @@ -1066,9 +1066,9 @@ FIRE ALARM if (istype(W, /obj/item/device/multitool)) src.detecting = !( src.detecting ) if (src.detecting) - user.visible_message("[user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") + user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.") else - user.visible_message("[user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") + user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.") else if (istype(W, /obj/item/weapon/wirecutters)) buildstage = 1 @@ -1076,7 +1076,7 @@ FIRE ALARM var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil() coil.amount = 5 coil.loc = user.loc - user << "You cut the wires from \the [src]" + user << "You cut the wires from \the [src]." update_icon() if(1) if(istype(W, /obj/item/stack/cable_coil)) @@ -1088,32 +1088,32 @@ FIRE ALARM coil.use(5) buildstage = 2 - user << "You wire \the [src]!" + user << "You wire \the [src]." update_icon() else if(istype(W, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user.visible_message("[user.name] removes the electronics from [src.name].", \ - "You start prying out the circuit.") + user.visible_message("[user.name] removes the electronics from [src.name].", \ + "You start prying out the circuit...") if(do_after(user, 20)) if(buildstage == 1) if(stat & BROKEN) - user << "You remove the destroyed circuit!" + user << "You remove the destroyed circuit." else - user << "You pry out the circuit!" + user << "You pry out the circuit." new /obj/item/weapon/firealarm_electronics(user.loc) buildstage = 0 update_icon() if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) - user << "You insert the circuit!" + user << "You insert the circuit." qdel(W) buildstage = 1 update_icon() else if(istype(W, /obj/item/weapon/wrench)) - user.visible_message("[user] removes the fire alarm assembly from the wall!", \ - "You remove the fire alarm assembly from the wall!") + user.visible_message("[user] removes the fire alarm assembly from the wall.", \ + "You remove the fire alarm assembly from the wall.") var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame() frame.loc = user.loc playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5450c05c626..3004a7a4389 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -245,7 +245,7 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + user << "You pulse-pressurize your jetpack from the tank." return ..() diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 64f7f4c35b4..059464d70e9 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -92,8 +92,8 @@ if (do_after(user, 40)) user.visible_message( \ "[user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ - "You hear ratchet.") + "You unfasten \the [src].", \ + "You hear ratchet.") new /obj/item/pipe_meter(src.loc) qdel(src) return diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index f264701ea04..d3a59024b15 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -38,7 +38,7 @@ name = "[name] (ID [id])" attack_hand(var/mob/user as mob) - usr << "You can't directly interact with this machine. Use the area atmos computer." + usr << "You can't directly interact with this machine! Use the area atmos computer." update_icon() src.overlays = 0 @@ -51,7 +51,7 @@ attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) if(on) - user << "Turn it off first!" + user << "Turn it off first!" return anchored = !anchored @@ -67,7 +67,7 @@ attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - user << "The bolts are too tight for you to unscrew!" + user << "The bolts are too tight for you to unscrew!" return ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 2b82a9e7b1f..88fa45990a7 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -143,14 +143,14 @@ stack.use(amount) else if(!user.unEquip(O)) - user << "/the [O] is stuck to your hand, you can't put it in \the [src]!" + user << "/the [O] is stuck to your hand, you can't put it in \the [src]!" O.loc = src icon_state = "autolathe" busy = 1 use_power(max(1000, (m_amt+g_amt)*amount/10)) src.m_amount += m_amt * amount src.g_amount += g_amt * amount - user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe." + user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe." if (O && O.loc == src) qdel(O) busy = 0 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index c0b32b5d4d8..9e33f0731db 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -128,7 +128,7 @@ if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again. locked = 0 emagged = 1 - user << "You bypass [src]'s controls." + user << "You bypass [src]'s controls." if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging. emagged = 2 remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel. @@ -136,15 +136,15 @@ bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet. - user << "You need to open maintenance panel first." + user << "You need to open maintenance panel first!" /obj/machinery/bot/examine(mob/user) ..() if (health < maxhealth) if (health > maxhealth/3) - user << "[src]'s parts look loose." + user << "[src]'s parts look loose." else - user << "[src]'s parts look very loose." + user << "[src]'s parts look very loose!" else user << "[src] is in pristine condition." @@ -248,17 +248,17 @@ user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") if(health >= maxhealth) - user << "[src] does not need a repair." + user << "[src] does not need a repair!" return if(!open) - user << "Unable to repair with the maintenance panel closed." + user << "Unable to repair with the maintenance panel closed!" return var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) health = min(maxhealth, health+10) - user.visible_message("[user] repairs [src]!","You repair [src]!") + user.visible_message("[user] repairs [src]!","You repair [src].") else - user << "The welder must be on for this task." + user << "The welder must be on for this task!" else if(W.force) //if force is non-zero var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 0e210e2918a..c198b798974 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -267,7 +267,7 @@ Auto Patrol[]"}, var/area/location = get_area(src) speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) target.visible_message("[src] has stunned [target]!",\ - "[src] has stunned [target]!") + "[src] has stunned you!") mode = BOT_PREP_ARREST anchored = 1 @@ -297,7 +297,7 @@ Auto Patrol[]"}, mode = BOT_ARREST playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) target.visible_message("[src] is trying to put zipties on [target]!",\ - "[src] is trying to put zipties on [target]!") + "[src] is trying to put zipties on you!") spawn(60) if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. @@ -585,7 +585,7 @@ Auto Patrol[]"}, if(WT.remove_fuel(0,user)) build_step++ name = "shielded frame assembly" - user << "You welded the vest to [src]." + user << "You weld the vest to [src]." if(4) switch(lasercolor) if("b") @@ -622,7 +622,7 @@ Auto Patrol[]"}, if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - user << "You need one length of cable to wire the ED-209." + user << "You need one length of cable to wire the ED-209!" return user << "You start to wire [src]..." if (do_after(user, 40)) @@ -659,7 +659,7 @@ Auto Patrol[]"}, if(istype(W, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) var/turf/T = get_turf(user) - user << "Now attaching the gun to the frame..." + user << "You start attaching the gun to the frame..." sleep(40) if(get_turf(user) == T) build_step++ diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 11885135158..fb262db136f 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -139,7 +139,7 @@ nagged = 0 updateicon() else - user << "You need at least one floor tile to put into [src]" + user << "You need at least one floor tile to put into [src]!" else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -466,7 +466,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) ..() return if(contents.len >= 1) - user << "They won't fit in, as there is already stuff inside." + user << "They won't fit in, as there is already stuff inside!" return if(T.use(10)) if(user.s_active) @@ -477,7 +477,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) user.unEquip(src, 1) qdel(src) else - user << "You need 10 floor tiles to start building a floorbot." + user << "You need 10 floor tiles to start building a floorbot!" return /obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params) @@ -487,7 +487,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor() B.created_name = created_name user.put_in_hands(B) - user << "You add the sensor to the toolbox and tiles!" + user << "You add the sensor to the toolbox and tiles." user.unEquip(src, 1) qdel(src) @@ -507,7 +507,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) var/turf/T = get_turf(user.loc) var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T) A.name = created_name - user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!" + user << "You add the robot arm to the odd looking toolbox assembly. Boop beep!" user.unEquip(src, 1) qdel(src) else if (istype(W, /obj/item/weapon/pen)) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 04be70bdf3c..3ac38374cc6 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -234,16 +234,16 @@ if(emagged) user << "ERROR" if(open) - user << "Please close the access panel before locking it." + user << "Please close the access panel before locking it!" else user << "Access denied." else if (istype(W, /obj/item/weapon/reagent_containers/glass)) if(locked) - user << "You cannot insert a beaker because the panel is locked." + user << "You cannot insert a beaker because the panel is locked!" return if(!isnull(reagent_glass)) - user << "There is already a beaker loaded." + user << "There is already a beaker loaded!" return user.drop_item() @@ -264,7 +264,7 @@ if(emagged == 2) declare_crit = 0 if(user) - user << "You short out [src]'s reagent synthesis circuits." + user << "You short out [src]'s reagent synthesis circuits." spawn(0) audible_message("[src] buzzes oddly!") flick("medibot_spark", src) @@ -482,7 +482,7 @@ return else C.visible_message("[src] is trying to inject [patient]!", \ - "[src] is trying to inject [patient]!") + "[src] is trying to inject you!") spawn(30) if ((get_dist(src, patient) <= 1) && (on)) @@ -492,8 +492,8 @@ reagent_glass.reagents.reaction(patient, INGEST) else patient.reagents.add_reagent(reagent_id,injection_amount) - C.visible_message("[src] injects [patient] with the syringe!", \ - "[src] injects [patient] with the syringe!") + C.visible_message("[src] injects [patient] with its syringe!", \ + "[src] injects you with its syringe!") patient = null mode = BOT_IDLE @@ -553,7 +553,7 @@ //Making a medibot! if(contents.len >= 1) - user << "You need to empty [src] out first." + user << "You need to empty [src] out first!" return var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly @@ -598,7 +598,7 @@ user.drop_item() qdel(W) build_step++ - user << "You complete the Medibot! Beep boop." + user << "You complete the Medibot. Beep boop!" var/turf/T = get_turf(src) var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T) S.skin = skin diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 5b5b65e1ea1..17e2305723b 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -98,7 +98,7 @@ obj/machinery/bot/mulebot/bot_reset() updateDialog() else if(istype(I,/obj/item/weapon/screwdriver)) if(locked) - user << "The maintenance hatch cannot be opened or closed while the controls are locked." + user << "The maintenance hatch cannot be opened or closed while the controls are locked!" return open = !open @@ -115,8 +115,8 @@ obj/machinery/bot/mulebot/bot_reset() if (health < maxhealth) health = min(maxhealth, health+25) user.visible_message( - "[user] repairs [src]!", - "You repair [src]!" + "[user] repairs [src]!", + "You repair [src]." ) else user << " [src] does not need a repair!" @@ -128,7 +128,7 @@ obj/machinery/bot/mulebot/bot_reset() unload(0) user.visible_message(" [user] knocks [load] off [src] with \the [I]!", " You knock [load] off [src] with \the [I]!") else - user << "You hit [src] with \the [I] but to no effect." + user << "You hit [src] with \the [I] but to no effect!" else ..() return @@ -266,7 +266,7 @@ obj/machinery/bot/mulebot/bot_reset() turn_off() else if (cell && !open) if (!turn_on()) - usr << "You can't switch on [src]." + usr << "You can't switch on [src]!" return else return @@ -281,7 +281,7 @@ obj/machinery/bot/mulebot/bot_reset() cell.add_fingerprint(usr) cell = null - usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].") + usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].") updateDialog() if("cellinsert") @@ -293,7 +293,7 @@ obj/machinery/bot/mulebot/bot_reset() C.loc = src C.add_fingerprint(usr) - usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].") + usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].") updateDialog() @@ -399,7 +399,7 @@ obj/machinery/bot/mulebot/bot_reset() // called to load a crate /obj/machinery/bot/mulebot/proc/load(var/atom/movable/C) if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate)) - visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") + visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) return // if not emagged, only allow crates to be loaded @@ -593,25 +593,25 @@ obj/machinery/bot/mulebot/bot_reset() blockcount++ mode = BOT_BLOCKED if(blockcount == 3) - visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") + visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) if(blockcount > 10) // attempt 10 times before recomputing // find new path excluding blocked turf - visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") + visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) spawn(2) calc_path(next) if(path.len > 0) - visible_message("[src] makes a delighted ping!", "You hear a ping.") + visible_message("[src] makes a delighted ping!", "You hear a ping.") playsound(loc, 'sound/machines/ping.ogg', 50, 0) mode = BOT_BLOCKED mode = BOT_WAIT_FOR_NAV return return else - visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") + visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) //world << "Bad turf." mode = BOT_NAV @@ -631,11 +631,11 @@ obj/machinery/bot/mulebot/bot_reset() if(path.len > 0) blockcount = 0 mode = BOT_BLOCKED - visible_message("[src] makes a delighted ping!", "You hear a ping.") + visible_message("[src] makes a delighted ping!", "You hear a ping.") playsound(loc, 'sound/machines/ping.ogg', 50, 0) else - visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") + visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) mode = BOT_NO_ROUTE @@ -682,7 +682,7 @@ obj/machinery/bot/mulebot/bot_reset() /obj/machinery/bot/mulebot/proc/at_target() if(!reached_target) radio_frequency = SUPP_FREQ //Supply channel - visible_message("[src] makes a chiming sound!", "You hear a chime.") + visible_message("[src] makes a chiming sound!", "You hear a chime.") playsound(loc, 'sound/machines/chime.ogg', 50, 0) reached_target = 1 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index fd2ac1c9d82..b8a0114fc33 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -230,7 +230,7 @@ Auto Patrol: []"}, var/area/location = get_area(src) speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) target.visible_message("[src] has stunned [target]!",\ - "[src] has stunned [target]!") + "[src] has stunned you!") mode = BOT_PREP_ARREST anchored = 1 @@ -260,7 +260,7 @@ Auto Patrol: []"}, mode = BOT_ARREST playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) target.visible_message("[src] is trying to put zipties on [target]!",\ - "[src] is trying to put zipties on [target]!") + "[src] is trying to put zipties on you!") spawn(60) if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return @@ -395,10 +395,10 @@ Auto Patrol: []"}, return if(!helmetCam) //I am so sorry for this. I could not think of a less terrible (and lazy) way. - user << "[src] needs to have a camera attached first." + user << "[src] needs to have a camera attached first!" return if(F) //Has a flashlight. Player must remove it, else it will be lost forever. - user << "The mounted flashlight is in the way, remove it first." + user << "The mounted flashlight is in the way, remove it first!" return if(S.secured) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index f93b7f48696..347bb920016 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -133,7 +133,7 @@ //user << "You start to [panel_open ? "close" : "open"] the camera's panel." //if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown panel_open = !panel_open - user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", + user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", "You screw the camera's panel [panel_open ? "open" : "closed"].") playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) @@ -142,7 +142,7 @@ else if(istype(W, /obj/item/weapon/weldingtool) && wires.CanDeconstruct()) if(weld(W, user)) - user << "You unweld the camera leaving it as just a frame screwed to the wall." + user << "You unweld the camera leaving it as just a frame screwed to the wall." if(!assembly) assembly = new() assembly.loc = src.loc @@ -191,7 +191,7 @@ P = W itemname = P.name info = P.notehtml - U << "You hold \the [itemname] up to the camera ..." + U << "You hold \the [itemname] up to the camera..." U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in player_list) if(istype(O, /mob/living/silicon/ai)) @@ -321,7 +321,7 @@ if(!WT.remove_fuel(0, user)) return 0 - user << "You start to weld [src]." + user << "You start to weld [src]..." playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 100)) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 10d4c1716b6..e5544d1d410 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -30,7 +30,7 @@ // State 0 if(istype(W, /obj/item/weapon/wrench) && isturf(src.loc)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You wrench the assembly into place." + user << "You wrench the assembly into place." anchored = 1 state = 1 update_icon() @@ -41,14 +41,14 @@ // State 1 if(istype(W, /obj/item/weapon/weldingtool)) if(weld(W, user)) - user << "You weld the assembly securely into place." + user << "You weld the assembly securely into place." anchored = 1 state = 2 return else if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You unattach the assembly from its place." + user << "You unattach the assembly from its place." anchored = 0 update_icon() state = 0 @@ -62,14 +62,14 @@ user << "You add wires to the assembly." state = 3 else - user << "You need two lengths of cable to wire a camera." + user << "You need two lengths of cable to wire a camera!" return return else if(istype(W, /obj/item/weapon/weldingtool)) if(weld(W, user)) - user << "You unweld the assembly from its place." + user << "You unweld the assembly from its place." state = 1 anchored = 1 return @@ -82,12 +82,12 @@ var/input = stripped_input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") if(!input) - usr << "No input found please hang up and try your call again." + usr << "No input found, please hang up and try your call again!" return var/list/tempnetwork = text2list(input, ",") if(tempnetwork.len < 1) - usr << "No network found please hang up and try your call again." + usr << "No network found, please hang up and try your call again!" return state = 4 @@ -115,13 +115,13 @@ new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You cut the wires from the circuits." + user << "You cut the wires from the circuits." state = 2 return // Upgrades! if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. - user << "You attach \the [W] into the assembly inner circuits." + user << "You attach \the [W] into the assembly inner circuits." upgrades += W user.drop_item() W.loc = src @@ -131,7 +131,7 @@ else if(istype(W, /obj/item/weapon/crowbar) && upgrades.len) var/obj/U = locate(/obj) in upgrades if(U) - user << "You unattach an upgrade from the assembly." + user << "You unattach an upgrade from the assembly." playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) U.loc = get_turf(src) upgrades -= U @@ -156,7 +156,7 @@ if(!WT.remove_fuel(0, user)) return 0 - user << "You start to weld \the [src].." + user << "You start to weld \the [src]..." playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 20)) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 59731eaa01b..e1b05f5c6c8 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -38,25 +38,25 @@ if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored) if(charging) - user << "There is already a cell in the charger." + user << "There is already a cell in the charger!" return else var/area/a = loc.loc // Gets our locations location, like a dream within a dream if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - user << "The [name] blinks red as you try to insert the cell!" + user << "The [name] blinks red as you try to insert the cell!" return user.drop_item() W.loc = src charging = W - user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") + user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") chargelevel = -1 updateicon() else if(istype(W, /obj/item/weapon/wrench)) if(charging) - user << "Remove the cell first!" + user << "Remove the cell first!" return anchored = !anchored @@ -76,7 +76,7 @@ user.put_in_hands(charging) charging.add_fingerprint(user) - user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.") + user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.") removecell() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ab45982bb34..87be0acbdf5 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -83,7 +83,7 @@ /obj/item/weapon/disk/data/attack_self(mob/user as mob) read_only = !read_only - user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." + user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." /obj/item/weapon/disk/data/examine(mob/user) ..() @@ -270,7 +270,7 @@ /obj/machinery/clonepod/emag_act(user as mob) if (isnull(src.occupant)) return - user << "You force an emergency ejection." + user << "You force an emergency ejection." src.locked = 0 src.go_out() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index c96493032e7..6d127808ceb 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -308,7 +308,7 @@ if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) - user << " You need a better grip to do that!" + user << " You need a better grip to do that!" return G.affecting.loc = src.loc G.affecting.Weaken(5) @@ -427,7 +427,7 @@ if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) - user << "You need a better grip to do that!" + user << "You need a better grip to do that!" return G.affecting.loc = src.loc G.affecting.Weaken(5) @@ -474,7 +474,7 @@ return /obj/machinery/readybutton/attack_paw(mob/user as mob) - user << "You are too primitive to use this device" + user << "You are too primitive to use this device!" return /obj/machinery/readybutton/New() @@ -486,7 +486,7 @@ /obj/machinery/readybutton/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + user << "This device is not powered!" return currentarea = get_area(src.loc) @@ -494,7 +494,7 @@ qdel(src) if(eventstarted) - usr << "The event has already begun!" + usr << "The event has already begun!" return ready = !ready diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 696952e9b89..48be900d0a9 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -15,6 +15,7 @@ if(0) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) + user << "You start wrenching the frame into place..." if(do_after(user, 20)) user << "You wrench the frame into place." anchored = 1 @@ -22,9 +23,10 @@ if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) - user << "The welder must be on for this task." + user << "The welder must be on for this task!" return playsound(loc, 'sound/items/Welder.ogg', 50, 1) + user << "You start to deconstruct the frame..." if(do_after(user, 20)) if(!src || !WT.remove_fuel(0, user)) return user << "You deconstruct the frame." @@ -33,6 +35,7 @@ if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) + user << "You start to unfasten the frame..." if(do_after(user, 20)) user << "You unfasten the frame." anchored = 0 @@ -66,6 +69,7 @@ var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) + user << "You start to add cables to the frame..." if(do_after(user, 20)) if (C.get_amount() >= 5 && state == 2) C.use(5) @@ -73,12 +77,12 @@ state = 3 icon_state = "3" else - user << "You need five lengths of cable to wire the AI core." + user << "You need five lengths of cable to wire the AI core!" return if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) - user << "Get that brain out of there first." + user << "Get that brain out of there first!" else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." @@ -91,6 +95,7 @@ var/obj/item/stack/sheet/rglass/G = P if(G.get_amount() >= 2) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) + user << "You start to put in the glass panel..." if(do_after(user, 20)) if (G.get_amount() >= 2 && state == 3) G.use(2) @@ -98,7 +103,7 @@ state = 4 icon_state = "4" else - user << "You need two sheets of reinforced glass to insert them into AI core." + user << "You need two sheets of reinforced glass to insert them into AI core!" return if(istype(P, /obj/item/weapon/aiModule/core/full)) //Allows any full core boards to be applied to AI cores. @@ -123,22 +128,22 @@ if(istype(P, /obj/item/device/mmi)) var/obj/item/device/mmi/M = P if(!M.brainmob) - user << "Sticking an empty MMI into the frame would sort of defeat the purpose." + user << "Sticking an empty MMI into the frame would sort of defeat the purpose!" return if(M.brainmob.stat == 2) - user << "Sticking a dead brain into the frame would sort of defeat the purpose." + user << "Sticking a dead brain into the frame would sort of defeat the purpose!" return if((config) && (!config.allow_ai)) - user << "This MMI does not seem to fit." + user << "This MMI does not seem to fit!" return if(jobban_isbanned(M.brainmob, "AI")) - user << "This MMI does not seem to fit." + user << "This MMI does not seem to fit!" return if(!M.brainmob.mind) - user << "This MMI is mindless." + user << "This MMI is mindless!" return ticker.mode.remove_cultist(M.brainmob.mind, 1) @@ -193,10 +198,12 @@ A.transfer_ai("INACTIVE","AICARD",src,user) if(istype(A, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) + user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \ + "You start to [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor...") switch(anchored) if(0) if(do_after(user, 20)) - user << "You wrench the core into place." + user << "You fasten the core into place." anchored = 1 if(1) if(do_after(user, 20)) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 76d084ffba7..f99fea98baa 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -31,7 +31,8 @@ /obj/item/toy/foamblade = 2, /obj/item/toy/redbutton = 2, /obj/item/toy/owl = 2, - /obj/item/toy/griffin = 2 + /obj/item/toy/griffin = 2, + /obj/item/weapon/coin/antagtoken = 2, ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 0250b8575d7..c9a01b96900 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -303,31 +303,31 @@ if(0) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You start wrenching the frame into place." + user << "You start wrenching the frame into place..." if(do_after(user, 20)) - user << "You've wrenched the frame into place." + user << "You wrench the frame into place." anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) if(!WT.isOn()) - user << "The welding tool must be on to complete this task." + user << "The welding tool must be on to complete this task!" return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) - user << "You start deconstructing the frame." + user << "You start deconstructing the frame..." if(do_after(user, 20)) if(!src || !WT.isOn()) return - user << "You've deconstructed the frame." + user << "You deconstruct the frame." var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You start to unfasten the frame." + user << "You start to unfasten the frame..." if(do_after(user, 20)) - user << "You've unfastened the frame." + user << "You unfasten the frame." anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) @@ -365,15 +365,15 @@ var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start adding cables to the frame." + user << "You start adding cables to the frame..." if(do_after(user, 20)) if(C.get_amount() >= 5 && state == 2) C.use(5) - user << "You've added cables to the frame." + user << "You add cables to the frame." state = 3 icon_state = "3" else - user << "You need five lengths of cable to wire the frame." + user << "You need five lengths of cable to wire the frame!" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) @@ -387,15 +387,15 @@ if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P if(G.get_amount() < 2) - user << "You need two glass sheets to continue construction." + user << "You need two glass sheets to continue construction!" return else playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to put in the glass panel." + user << "You start to put in the glass panel..." if(do_after(user, 20)) if(G.get_amount() >= 2 && state == 3) G.use(2) - user << "You've put in the glass panel." + user << "You put in the glass panel." state = 4 src.icon_state = "4" if(4) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 8559097293f..169100a2ab8 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -3,15 +3,22 @@ desc = "Used to access the various cameras on the station." icon_state = "cameras" //circuit = /obj/item/weapon/circuitboard/security - var/mob/camera/aiEye/remote/eyeobj = new() + var/mob/camera/aiEye/remote/eyeobj var/mob/living/carbon/human/current_user = null var/list/networks = list("SS13") var/datum/action/camera_off/off_action = new var/datum/action/camera_jump/jump_action = new -/obj/machinery/computer/camera_advanced/New() +/obj/machinery/computer/camera_advanced/proc/CreateEye() + eyeobj = new() eyeobj.origin = src +/obj/machinery/computer/camera_advanced/proc/GrantActions(var/mob/living/carbon/user) + off_action.target = user + off_action.Grant(user) + jump_action.target = user + jump_action.Grant(user) + /obj/machinery/computer/camera_advanced/check_eye(var/mob/user as mob) if (get_dist(user, src) > 1 || user.eye_blind) off_action.Activate() @@ -24,11 +31,11 @@ if(!iscarbon(user)) return var/mob/living/carbon/L = user + if(!current_user) - off_action.target = user - off_action.Grant(user) - jump_action.target = user - jump_action.Grant(user) + if(!eyeobj) + CreateEye() + GrantActions(user) current_user = user eyeobj.user = user eyeobj.name = "Camere Eye ([user.name])" @@ -43,6 +50,8 @@ eyeobj.setLoc(get_turf(C)) break eyeobj.initialized = 1 + else + eyeobj.setLoc(eyeobj.loc) else user << "The console is already in use!" @@ -57,6 +66,11 @@ var/visible_icon = 0 var/image/user_image = null +/mob/camera/aiEye/remote/GetViewerClient() + if(user) + return user.client + return null + /mob/camera/aiEye/remote/setLoc(var/T) if(user) if(!isturf(user.loc)) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index acc6cccc4db..180f3dc2fd5 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -354,7 +354,7 @@ var/time_last_changed_position = 0 if(region_access) authenticated = 1 else if ((!( authenticated ) && (istype(usr, /mob/living/silicon))) && (!modify)) - usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in." + usr << "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in." if ("logout") region_access = null head_subordinates = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 240cdaa11b7..38489cb1497 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -79,7 +79,7 @@ user.drop_item() W.loc = src src.diskette = W - user << "You insert [W]." + user << "You insert [W]." src.updateUsrDialog() return else diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 1c0138f4c66..c335d4ad6f6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -103,11 +103,11 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 else: - usr << "You are not authorized to do this." + usr << "You are not authorized to do this!" tmp_alertlevel = 0 state = STATE_DEFAULT else - usr << "You need to swipe your ID." + usr << "You need to swipe your ID!" if("announce") if(src.authenticated==2 && !message_cooldown) @@ -333,7 +333,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.emagged = 1 if(authenticated == 1) authenticated = 2 - user << "You scramble the communication routing circuits!" + user << "You scramble the communication routing circuits." /obj/machinery/computer/communications/attack_hand(var/mob/user as mob) if(..()) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index a284f291fd0..18f8925050f 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -97,7 +97,7 @@ /obj/machinery/computer/attackby(I as obj, user as mob, params) if(istype(I, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You start to disconnect the monitor." + user << " You start to disconnect the monitor..." if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) A.circuit = circuit @@ -127,12 +127,12 @@ if(prob(10)) user.visible_message("[user.name] smashes the [src.name] with its paws.",\ "You smash the [src.name] with your paws.",\ - "You hear a smashing sound.") + "You hear a smashing sound.") set_broken() return user.visible_message("[user.name] smashes against the [src.name] with its paws.",\ "You smash against the [src.name] with your paws.",\ - "You hear a clicking sound.") + "You hear hear a clicking sound.") /obj/machinery/computer/attack_alien(mob/living/user) user.do_attack_animation(src) @@ -140,9 +140,9 @@ if(prob(80)) user.visible_message("[user.name] smashes the [src.name] with its claws.",\ "You smash the [src.name] with your claws.",\ - "You hear a smashing sound.") + "You hear a smashing sound.") set_broken() return user.visible_message("[user.name] smashes against the [src.name] with its claws.",\ "You smash against the [src.name] with your claws.",\ - "You hear a clicking sound.") + "You hear a clicking sound.") diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index c314be68b5e..0ab00973dd5 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -10,7 +10,7 @@ if(src.stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - user << "You haven't selected anything to transmit laws to!" + user << "You haven't selected anything to transmit laws to!" return if(!can_upload_to(current)) user << "Upload failed! Check to make sure [current.name] is functioning properly." @@ -43,7 +43,7 @@ src.current = select_active_ai(user) if (!src.current) - user << "No active AIs detected." + user << "No active AIs detected!" else user << "[src.current.name] selected for law changes." @@ -68,7 +68,7 @@ src.current = select_active_free_borg(user) if(!src.current) - user << "No active unslaved cyborgs detected." + user << "No active unslaved cyborgs detected!" else user << "[src.current.name] selected for law changes." diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index bc686b127d9..8a52e787827 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -24,7 +24,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index d58f416f99c..c021d2e158a 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -132,7 +132,7 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "You hear a voice in your head saying: '[warning]'" + R << "You hear a voice in your head saying: '[warning]'" log_say("[usr]/[usr.ckey] sent an implant message to [R]/[R.ckey]: '[warning]'") src.add_fingerprint(usr) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f4f5f3c9d00..3ac9f1abf03 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -28,7 +28,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 781cc48cf99..c2a98ae7c84 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -55,7 +55,7 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) - user << "This part is faulty, you cannot add this to the machine!" + user << "This part is faulty, you cannot add this to the machine!" return switch(state) if(1) @@ -207,7 +207,7 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P if (CP.get_amount() < 1) - user << "You need more cable!" + user << "You need more cable!" return var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) @@ -222,7 +222,7 @@ update_req_desc() return 1 if(!success) - user << "You cannot add that to the machine!" + user << "You cannot add that to the machine!" return 0 diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6c57394b1ef..851bf6e643f 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -230,13 +230,13 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "A beaker is already loaded into [src]." + user << "A beaker is already loaded into [src]!" return beaker = I user.drop_item() I.loc = src - user.visible_message("[user] places [I] in [src].", \ + user.visible_message("[user] places [I] in [src].", \ "You place [I] in [src].") if(!(on || occupant || state_open)) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 98c7cf1fff0..471818ca3c4 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -67,11 +67,11 @@ for reference: user.changeNext_move(CLICK_CD_MELEE) if (istype(W, /obj/item/stack/sheet/mineral/wood)) if (src.health < src.maxhealth) - visible_message("[user] begins to repair \the [src]!") + visible_message("[user] begins to repair \the [src]!", "You begin to repair \the [src]...") if(do_after(user,20)) src.health = src.maxhealth W:use(1) - visible_message("[user] repairs \the [src]!") + visible_message("[user] repairs \the [src]!", "You repair \the [src].") return else return @@ -84,7 +84,7 @@ for reference: src.health -= W.force * 0.75 else if (src.health <= 0) - visible_message("The barricade is smashed apart!") + visible_message("The barricade is smashed apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -94,13 +94,13 @@ for reference: /obj/structure/barricade/wooden/ex_act(severity, target) switch(severity) if(1.0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") qdel(src) return if(2.0) src.health -= 25 if (src.health <= 0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -110,7 +110,7 @@ for reference: /obj/structure/barricade/wooden/blob_act() src.health -= 25 if (src.health <= 0) - visible_message("The blob eats through the barricade!") + visible_message("The blob eats through the barricade!") qdel(src) return @@ -196,7 +196,7 @@ for reference: if (src.emagged == 0) src.emagged = 1 src.req_access = null - user << "You break the ID authentication lock on \the [src]." + user << "You break the ID authentication lock on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() @@ -204,7 +204,7 @@ for reference: return else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on \the [src]." + user << "You short out the anchoring mechanism on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 003ac40d218..64117c66660 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -640,7 +640,7 @@ About the new airlock wires panel: playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message("[user] headbutts the airlock.", \ - "[user] headbutts the airlock!") + "You headbutt the airlock!") var/obj/item/organ/limb/affecting = H.get_organ("head") H.Stun(5) H.Weaken(5) @@ -889,9 +889,9 @@ About the new airlock wires panel: if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density)) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0,user)) - user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "You begin [welded ? "unwelding":"welding"] the airlock...", \ - "You hear welding.") + user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ + "You begin [welded ? "unwelding":"welding"] the airlock...", \ + "You hear welding.") playsound(loc, 'sound/items/Welder.ogg', 40, 1) if(do_after(user,40,5,1)) if(density && !operating)//Door must be closed to weld. @@ -899,8 +899,8 @@ About the new airlock wires panel: return playsound(loc, 'sound/items/Welder2.ogg', 50, 1) welded = !welded - user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ - "You've [welded ? "welded the airlock shut":"unwelded the airlock"].") + user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ + "You [welded ? "weld the airlock shut":"unweld the airlock"].") update_icon() return else if(istype(C, /obj/item/weapon/screwdriver)) @@ -924,8 +924,8 @@ About the new airlock wires panel: beingcrowbarred = 0 if( beingcrowbarred && (density && welded && !operating && src.p_open && (!hasPower()) && !src.locked) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "You start to remove electronics from the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", \ + "You start to remove electronics from the airlock assembly...") if(do_after(user,40)) if(src.loc) if(src.doortype) @@ -935,7 +935,7 @@ About the new airlock wires panel: user << "You discard the damaged electronics." qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -953,9 +953,9 @@ About the new airlock wires panel: qdel(src) return else if(hasPower()) - user << " The airlock's motors resist your efforts to force it." + user << " The airlock's motors resist your efforts to force it!" else if(locked) - user << " The airlock's bolts prevent it from being forced." + user << " The airlock's bolts prevent it from being forced!" else if( !welded && !operating) if(density) if(beingcrowbarred == 0) //being fireaxe'd @@ -963,7 +963,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) open(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) open(2) else @@ -972,7 +972,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) close(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) close(2) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 412048bb8a5..93331e30e07 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -213,8 +213,8 @@ return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - user.visible_message("[user] smashes against the [src.name].", \ - "[user] smashes against the [src.name].") + user.visible_message("[user] smashes against the [src.name]!", \ + "You smash against the [src.name]!") take_damage(damage) /obj/machinery/door/window/attack_alien(mob/living/user as mob) @@ -264,7 +264,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(src.density || src.operating) - user << "You need to open the door to access the maintenance panel." + user << "You need to open the door to access the maintenance panel!" return playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) src.p_open = !( src.p_open ) @@ -274,8 +274,8 @@ if(istype(I, /obj/item/weapon/crowbar)) if(p_open && !src.density && !src.operating) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the [src.name].", \ - "You start to remove electronics from the [src.name].") + user.visible_message("[user] removes the electronics from the [src.name].", \ + "You start to remove electronics from the [src.name]...") if(do_after(user,40)) if(src.p_open && !src.density && !src.operating && src.loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(src.loc) @@ -302,7 +302,7 @@ qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f575ccd7778..fdea6d8469f 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -40,23 +40,23 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wirecutters)) if (bulb) - user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb.") + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb...") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) if(do_after(user, 30) && bulb) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") + user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb.") bulb.loc = src.loc bulb = null power_change() else if (istype(W, /obj/item/device/flash/handheld)) if (!bulb) - user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") + user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") user.drop_item() W.loc = src bulb = W power_change() else - user << "A flashbulb is already installed in [src]." + user << "A flashbulb is already installed in [src]!" add_fingerprint(user) //Let the AI trigger them directly. diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index aa9be627ab2..0354e94eac4 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -76,10 +76,10 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") + user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") icon_state = "[base_state]-d" if (!src.disable) - user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") + user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") if(src.powered()) icon_state = "[base_state]" else diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index b56321f9588..2255f1c0017 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -53,35 +53,35 @@ return if(attached) - visible_message("[attached] is detached from \the [src]") + visible_message("[attached] is detached from \the [src].") attached = null update_icon() return if(!ishuman(target)) - usr << "The drip beeps: Warning, human patients only!" + usr << "The drip beeps: Warning, human patients only!" return if(Adjacent(target) && usr.Adjacent(target)) if(beaker) - visible_message("[usr] attaches \the [src] to \the [target].") + usr.visible_message("[usr] attaches \the [src] to \the [target].", "You attach \the [src] to \the [target].") attached = target SSmachine.processing.Add(src) update_icon() else - usr << "There's nothing attached to the IV drip!" + usr << "There's nothing attached to the IV drip!" /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) - user << "There is already a reagent container loaded!" + user << "There is already a reagent container loaded!" return user.drop_item() W.loc = src beaker = W - user << "You attach \the [W] to \the [src]." + user << "You attach \the [W] to \the [src]." update_icon() return else @@ -163,7 +163,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) @@ -180,7 +180,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index bfa9f68ef65..4949aa3024b 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -227,7 +227,7 @@ Class Procs: if(be_close && in_range(M, src)) return 1 else - src << "You don't have the dexterity to do this!" + src << "You don't have the dexterity to do this!" return /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) @@ -284,7 +284,7 @@ Class Procs: if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 /* //distance checks are made by atom/proc/DblClick @@ -297,7 +297,7 @@ Class Procs: visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]!" return 1 src.add_fingerprint(user) @@ -361,10 +361,10 @@ Class Procs: /obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) - user << "Now [anchored ? "un" : ""]securing [name]." + user << "You begin [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, time)) - user << "You've [anchored ? "un" : ""]secured [name]." + user << "You [anchored ? "un" : ""]secure [name]." anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) return 1 diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 3851c577c72..7c2a44e115c 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -112,7 +112,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") + user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") updateicon() @@ -120,12 +120,12 @@ if(open) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + user << "Controls are now [src.locked ? "locked" : "unlocked"]." else user << "Access denied." updateDialog() else - user << "You must open the cover first!" + user << "You must open the cover first!" return /obj/machinery/navbeacon/attack_ai(var/mob/user) @@ -143,7 +143,7 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The beacon's control cover is closed." + user << "The beacon's control cover is closed!" return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index a69a1526de8..d374dfb6480 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -103,13 +103,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "Newscaster cannot be placed on this spot." + usr << "Newscaster cannot be placed on this spot!" return if (A.requires_power == 0 || A.name == "Space") - usr << "Newscaster cannot be placed in this area." + usr << "Newscaster cannot be placed in this area!" return for(var/obj/machinery/newscaster/T in loc) - usr << "There is another newscaster here." + usr << "There is another newscaster here!" return var/obj/machinery/newscaster/N = new(loc) N.pixel_y -= (loc.y - on_wall.y) * 32 @@ -793,9 +793,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params) if(istype(I, /obj/item/weapon/wrench)) - user << "Now [anchored ? "un" : ""]securing [name]" + user << "You start [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 60)) + user << "You [anchored ? "un" : ""]secure [name]." new /obj/item/newscaster_frame(loc) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) @@ -823,12 +824,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co audible_message("[user.name] forcefully slams the [src.name] with the [I.name]!", null, 5 ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else - user << "This does nothing." + user << "This does nothing!" src.update_icon() /obj/machinery/newscaster/attack_paw(mob/user as mob) - user << "The newscaster controls are far too complicated for your tiny brain!" + user << "The newscaster controls are far too complicated for your tiny brain!" return /obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) @@ -860,7 +861,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else targetcam = R.aicamera else - user << "You cannot interface with silicon photo uploading" //gtfo pAIs + user << "You cannot interface with silicon photo uploading!" //gtfo pAIs if(targetcam.aipictures.len == 0) usr << "No images saved" diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 6e277a7ece8..a4db08cf85b 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -310,7 +310,7 @@ var/global/list/pipeID2State = list( for(var/obj/machinery/atmospherics/M in src.loc) if(M.initialize_directions & pipe_dir) // matches at least one direction on either type of pipe - user << "There is already a pipe at that location." + user << "There is already a pipe at that location!" return 1 // no conflicts found @@ -405,8 +405,8 @@ var/global/list/pipeID2State = list( playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ "[user] fastens \the [src].", \ - "You have fastened \the [src].", \ - "You hear ratchet.") + "You fasten \the [src].", \ + "You hear ratchet.") qdel(src) // remove the pipe item @@ -431,9 +431,9 @@ var/global/list/pipeID2State = list( if (!istype(W, /obj/item/weapon/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) - user << "You need to fasten it to a pipe." + user << "You need to fasten it to a pipe!" return 1 new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You have fastened the meter to the pipe." + user << "You fasten the meter to the pipe." qdel(src) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 7c68419557b..ed9680d8988 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -86,8 +86,8 @@ add_fingerprint(user) user.visible_message( \ "[user] fastens \the [src].", \ - "You have fastened \the [src]. Now it can dispense pipes.", \ - "You hear ratchet.") + "You fasten \the [src]. Now it can dispense pipes.", \ + "You hear ratchet.") anchored = 1 stat &= MAINT if (usr.machine==src) @@ -99,8 +99,8 @@ add_fingerprint(user) user.visible_message( \ "[user] unfastens \the [src].", \ - "You have unfastened \the [src]. Now it can be pulled somewhere else.", \ - "You hear ratchet.") + "You unfasten \the [src]. Now it can be pulled somewhere else.", \ + "You hear ratchet.") anchored = 0 stat |= ~MAINT power_change() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 900edaf63ea..714d70e0907 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -253,7 +253,7 @@ if(istype(I, /obj/item/weapon/crowbar)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components - user << "You begin prying the metal coverings off." + user << "You begin prying the metal coverings off..." sleep(20) if(prob(70)) user << "You remove the turret and salvage some components." @@ -680,7 +680,7 @@ build_step = 2 icon_state = "turret_frame2" else - user << "You need two sheets of metal to continue construction." + user << "You need two sheets of metal to continue construction!" return else if(istype(I, /obj/item/weapon/wrench)) @@ -703,14 +703,15 @@ if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. - user << "You need more fuel to complete this task." + user << "You need more fuel to complete this task!" return playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) + user << "You start to remove the turret's interior metal armor..." if(do_after(user, 20)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 - user << "You remove the turret's interior metal armor." + user << "You remove the turret's interior metal armor." new /obj/item/stack/sheet/metal( loc, 2) return @@ -722,7 +723,7 @@ return var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return installation = I.type //installation becomes I.type gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge @@ -741,9 +742,9 @@ if(isprox(I)) build_step = 5 if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return - user << "You add the prox sensor to the turret." + user << "You add the proximity sensor to the turret." qdel(I) return @@ -765,7 +766,7 @@ user << "You add some metal armor to the exterior frame." build_step = 7 else - user << "You need two sheets of metal to continue construction." + user << "You need two sheets of metal to continue construction!" return else if(istype(I, /obj/item/weapon/screwdriver)) @@ -779,9 +780,10 @@ var/obj/item/weapon/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) - user << "You need more fuel to complete this task." + user << "You need more fuel to complete this task!" playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) + user << "You begin to weld the turret's armor down..." if(do_after(user, 30)) if(!src || !WT.remove_fuel(5, user)) return diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1ba38ab9140..7c7d9efb9a4 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -436,11 +436,11 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) if (istype(O, /obj/item/weapon/crowbar)) if(open) - user << "You close the maintenance panel." + user << "You close the maintenance panel." open = 0 icon_state="req_comp0" else - user << "You open the maintenance panel." + user << "You open the maintenance panel." open = 1 if(hackState == 0) icon_state="req_comp_open" @@ -449,15 +449,15 @@ var/list/obj/machinery/requests_console/allConsoles = list() if (istype(O, /obj/item/weapon/screwdriver)) if(open) if(hackState == 0) - user << "You modify the wiring." + user << "You modify the wiring." hackState = 1 icon_state="req_comp_rewired" else if(hackState == 1) - user << "You reset the wiring." + user << "You reset the wiring." hackState = 0 icon_state="req_comp_open" else - user << "You can't do much with that." + user << "You can't do much with that!" update_icon() var/obj/item/weapon/card/id/ID = O.GetID() @@ -470,7 +470,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() announceAuth = 1 else announceAuth = 0 - user << "You are not authorized to send announcements." + user << "You are not authorized to send announcements!" updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(screen == 9) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 85c818f2fd8..2e1c8275332 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -28,7 +28,7 @@ if (O:amount < 1) qdel(O) - user << "You insert [count] metal sheet\s into \the [src]." + user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" updateDialog() else diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 1b1e68bbf6e..9692acc5ca6 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -210,25 +210,25 @@ /obj/machinery/shieldgen/attack_hand(mob/user as mob) if(locked) - user << "The machine is locked, you are unable to use it." + user << "The machine is locked, you are unable to use it!" return if(is_open) - user << "The panel must be closed before operating this machine." + user << "The panel must be closed before operating this machine!" return if (src.active) - user.visible_message("\icon[src] [user] deactivated the shield generator.", \ - "\icon[src] You deactivate the shield generator.", \ - "You hear heavy droning fade out.") + user.visible_message("[src] [user] deactivated the shield generator.", \ + "[src] You deactivate the shield generator.", \ + "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\icon[src] [user] activated the shield generator.", \ - "\icon[src] You activate the shield generator.", \ - "You hear heavy droning.") + user.visible_message("[src] [user] activated the shield generator.", \ + "[src] You activate the shield generator.", \ + "You hear heavy droning.") src.shields_up() else - user << "The device must first be secured to the floor." + user << "The device must first be secured to the floor!" return /obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -244,21 +244,21 @@ else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - user << "You need one length of cable to repair [src]." + user << "You need one length of cable to repair [src]!" return - user << "You begin to replace the wires." + user << "You begin to replace the wires..." if(do_after(user, 30)) if(coil.get_amount() < 1) return coil.use(1) health = max_health malfunction = 0 - user << "You repair \the [src]!" + user << "You repair \the [src]." update_icon() else if(istype(W, /obj/item/weapon/wrench)) if(locked) - user << "The bolts are covered, unlocking this would retract the covers." + user << "The bolts are covered! Unlocking this would retract the covers." return if(!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) @@ -276,7 +276,7 @@ else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(src.allowed(user)) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + user << "You [src.locked ? "lock" : "unlock"] the controls." else user << "Access denied." @@ -348,13 +348,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(!anchored) - user << "The shield generator needs to be firmly secured to the floor first." + user << "The shield generator needs to be firmly secured to the floor first!" return 1 if(locked && !istype(user, /mob/living/silicon)) - user << "The controls are locked!" + user << "The controls are locked!" return 1 if(power != 1) - user << "The shield generator needs to be powered by wire underneath." + user << "The shield generator needs to be powered by wire underneath!" return 1 if(src.active >= 1) @@ -362,15 +362,15 @@ icon_state = "Shield_Gen" user.visible_message("[user] turned the shield generator off.", \ - "You turn off the shield generator.", \ - "You hear heavy droning fade out.") + "You turn off the shield generator.", \ + "You hear heavy droning fade out.") src.cleanup() else src.active = 1 icon_state = "Shield_Gen +a" user.visible_message("[user] turned the shield generator on.", \ - "You turn on the shield generator.", \ - "You hear heavy droning.") + "You turn on the shield generator.", \ + "You hear heavy droning.") src.add_fingerprint(user) /obj/machinery/shieldwallgen/process() @@ -396,7 +396,7 @@ if(src.active >= 1) if(src.power == 0) src.visible_message("The [src.name] shuts down due to lack of power!", \ - "You hear heavy droning fade out") + "You hear heavy droning fade out.") icon_state = "Shield_Gen" src.active = 0 src.cleanup(1) @@ -452,7 +452,7 @@ /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) if(active) - user << "Turn off the field generator first." + user << "Turn off the field generator first!" return else if(!anchored && !isinspace()) //Can't fasten this thing in space @@ -470,7 +470,7 @@ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + user << "You [src.locked ? "lock" : "unlock"] the controls." else user << "Access denied." diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 223472818c6..da7f6a82c53 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -48,7 +48,7 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is already a power cell inside." + user << "There is already a power cell inside!" return else // insert cell @@ -59,13 +59,13 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") + user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else - user << "The hatch must be open to insert a power cell." + user << "The hatch must be open to insert a power cell!" return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the hatch on \the [src].", "You [open ? "open" : "close"] the hatch on \the [src].") + user.visible_message("[user] [open ? "opens" : "closes"] the hatch on \the [src].", "You [open ? "open" : "close"] the hatch on \the [src].") update_icon() if(!open && user.machine == src) user << browse(null, "window=spaceheater") @@ -103,7 +103,7 @@ else on = !on - user.visible_message("[user] switches [on ? "on" : "off"] \the [src].","You switch [on ? "on" : "off"] \the [src].") + user.visible_message("[user] switches [on ? "on" : "off"] \the [src].","You switch [on ? "on" : "off"] \the [src].") update_icon() return @@ -127,7 +127,7 @@ usr.put_in_hands(cell) cell.add_fingerprint(usr) cell = null - usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") + usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") if("cellinstall") @@ -139,7 +139,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") + usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") updateDialog() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e1755317dce..cc5c8e96fb8 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -277,10 +277,10 @@ return*/ else //welp, the guy is protected, we can continue if(src.issuperUV) - user << "You slide the dial back towards \"185nm\"." + user << "You slide the dial back towards \"185nm\"." src.issuperUV = 0 else - user << "You crank the dial all the way up to \"15nm\"." + user << "You crank the dial all the way up to \"15nm\"." src.issuperUV = 1 return @@ -302,7 +302,7 @@ user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere." return*/ else - user << "You push the button. The coloured LED next to it changes." + user << "You push the button. The coloured LED next to it changes." src.safetieson = !src.safetieson @@ -339,7 +339,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) if(src.islocked || src.isUV) - user << "Unable to open unit." + user << "You're unable to open unit!" return 0 if(src.OCCUPANT) src.eject_occupant(user) @@ -350,7 +350,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) if(src.OCCUPANT && src.safetieson) - user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." + user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." return if(src.isopen) return @@ -367,7 +367,7 @@ if(!src.HELMET && !src.MASK && !src.SUIT && !src.STORAGE && !src.OCCUPANT ) //shit's empty yo user << "Unit storage bays empty. Nothing to disinfect -- Aborting." return - user << "You start the Unit's cauterisation cycle." + user << "You start the Unit's cauterisation cycle." src.cycletime_left = 20 src.isUV = 1 if(src.OCCUPANT && !src.islocked) @@ -447,7 +447,7 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT var/breakout_time = 2 - user << "You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)" + user << "You start kicking against the doors to escape... (This will take about [breakout_time] minutes.)" visible_message("You see [user] kicking against the doors of \the [src]!") if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src || isopen || !islocked) @@ -455,7 +455,7 @@ else isopen = 1 islocked = 0 - visible_message("[user] successfully broke out of [src]!") + visible_message("[user] successfully broke out of [src]!") else return @@ -475,18 +475,18 @@ if (user.stat != 0) return if (!src.isopen) - user << "The unit's doors are shut." + user << "The unit's doors are shut!" return if (!src.ispowered || src.isbroken) - user << "The unit is not operational." + user << "The unit is not operational!" return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) || (src.STORAGE)) - user << "It's too cluttered inside to fit in!" + user << "It's too cluttered inside to fit in!" return if(M == user) visible_message("[user] starts squeezing into the suit storage unit!", 3) else - visible_message("[user] starts putting [M.name] into the Suit Storage Unit.", 3) + visible_message("[user] starts putting [M.name] into the Suit Storage Unit!", 3) if(do_mob(user, M, 10)) user.stop_pulling() if(M.client) @@ -529,9 +529,9 @@ user << "The unit already contains a suit." return if(!user.drop_item()) - user << "\The [S] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [S] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [S.name] into the suit storage compartment." + user << "You load the [S.name] into the suit storage compartment." S.loc = src src.SUIT = S src.update_icon() @@ -542,12 +542,12 @@ return var/obj/item/clothing/head/helmet/H = I if(src.HELMET) - user << "The unit already contains a helmet." + user << "The unit already contains a helmet!" return if(!user.drop_item()) - user << "\The [H] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [H] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [H.name] into the helmet storage compartment." + user << "You load the [H.name] into the helmet storage compartment." H.loc = src src.HELMET = H src.update_icon() @@ -558,12 +558,12 @@ return var/obj/item/clothing/mask/M = I if(src.MASK) - user << "The unit already contains a mask." + user << "The unit already contains a mask!" return if(!user.drop_item()) - user << "\The [M] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [M] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [M.name] into the mask storage compartment." + user << "You load the [M.name] into the mask storage compartment." M.loc = src src.MASK = M src.update_icon() @@ -574,12 +574,12 @@ return var/obj/item/ITEM = I if(src.STORAGE) - user << "The auxiliary storage compartment is full." + user << "The auxiliary storage compartment is full!" return if(!user.drop_item()) - user << "\The [ITEM] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [ITEM] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [ITEM.name] into the auxiliary storage compartment." + user << "You load the [ITEM.name] into the auxiliary storage compartment." ITEM.loc = src src.STORAGE = ITEM src.update_icon() @@ -592,7 +592,7 @@ /obj/machinery/suit_storage_unit/attack_paw(mob/user as mob) - user << "The console controls are far too complicated for your tiny brain!" + user << "The console controls are far too complicated for your tiny brain!" return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 957f0665266..d8ed227bb51 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -150,14 +150,14 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - user << "You need to screw the beacon to the floor first!" + user << "You need to screw the beacon to the floor first!" return /obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) - user << "You need to deactivate the beacon first!" + user << "You need to deactivate the beacon first!" return if(anchored) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index bff628e32d3..bea3f1e054d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -52,16 +52,16 @@ if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) - user << "The bomb must be placed on solid ground to attach it" + user << "The bomb must be placed on solid ground to attach it." else - user << "You firmly wrench the bomb to the floor" + user << "You firmly wrench the bomb to the floor." playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 1 if(active) - user << "The bolts lock in place" + user << "The bolts lock in place." else if(!active) - user << "You wrench the bomb from the floor" + user << "You wrench the bomb from the floor." playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 0 else @@ -83,11 +83,11 @@ payload.loc = user.loc payload = null else - user << "There isn't anything in here to remove!" + user << "There isn't anything in here to remove!" else if (open_panel) - user << "The wires conneting the shell to the explosives are holding it down!" + user << "The wires connecting the shell to the explosives are holding it down!" else - user << "The cover is screwed on, it won't pry off!" + user << "The cover is screwed on, it won't pry off!" else if(istype(I, /obj/item/weapon/bombcore)) if(!payload) payload = I @@ -95,7 +95,7 @@ user.drop_item() payload.loc = src else - user << "[payload] is already loaded into [src], you'll have to remove it first." + user << "[payload] is already loaded into [src]! You'll have to remove it first." else ..() @@ -114,7 +114,7 @@ settings(user) return else if(anchored) - user << "The bomb is bolted to the floor!" + user << "The bomb is bolted to the floor!" return /obj/machinery/syndicatebomb/proc/settings(var/mob/user) @@ -126,7 +126,7 @@ if(alert(user,"Would you like to start the countdown now?",,"Yes","No") == "Yes" && in_range(src, user) && isliving(user)) if(defused || active) if(defused) - src.loc.visible_message("\icon[src] Device error: User intervention required.") + src.loc.visible_message("\icon[src] Device error: User intervention required.") return else src.loc.visible_message("\icon[src] [timer] seconds until detonation, please clear the area.") diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index b6ab78b9fc1..cc877492b58 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -104,7 +104,7 @@ // --- Centcom radio, yo. --- - else if(data == 4) + else if(data == 5) for(var/obj/item/device/radio/R in all_radios["[freq]"]) if(!R.centcom) @@ -219,7 +219,7 @@ // --- Centcom radio, yo. --- - else if(data == 4) + else if(data == 5) for(var/obj/item/device/radio/R in all_radios["[RADIO_CHAT]"]) if(R.centcom) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index e04ae94a755..0c31ede202a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -34,7 +34,7 @@ var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) if(!user.unEquip(L)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return L.loc = src locked = L @@ -117,10 +117,10 @@ target = get_turf(locked.locked_location) if(href_list["calibrate"]) if(!target) - usr << "Error: No target set to calibrate to." + usr << "Error: No target set to calibrate to." return if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3) - usr << "Hub is already calibrated." + usr << "Hub is already calibrated!" return src.visible_message("Processing hub calibration to target...") @@ -131,7 +131,7 @@ power_station.teleporter_hub.calibrated = 1 src.visible_message("Calibration complete.") else - src.visible_message("Error: Unable to detect hub.") + src.visible_message("Error: Unable to detect hub.") updateDialog() updateDialog() @@ -293,7 +293,7 @@ if (!com) return if (!com.target) - visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") + visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") return if (istype(M, /atom/movable)) if(do_teleport(M, com.target)) @@ -301,7 +301,7 @@ if(ishuman(M))//don't remove people from the round randomly you jerks var/mob/living/carbon/human/human = M if(human.dna && human.dna.species.id == "human") - M << "You hear a buzzing in your ears." + M << "You hear a buzzing in your ears." human.dna.species = new /datum/species/fly() human.regenerate_icons() human.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), IRRADIATE, 0) @@ -384,7 +384,7 @@ M.buffer = null user << "You upload the data from the [W.name]'s buffer." else - user << "This station cant hold more information, try to use better parts." + user << "This station can't hold more information, try to use better parts." if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) update_icon() return diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 0fb0bb0bd43..b1c356a0982 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -419,7 +419,7 @@ /obj/machinery/gun_turret/attack_alien(mob/living/user as mob) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) - user.visible_message("[user] slashes at [src]", "You slash at [src]") + user.visible_message("[user] slashes at [src]!", "You slash at [src]!") take_damage(15) return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f7385507a95..405abb48ddc 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -246,7 +246,7 @@ if(istype(W, /obj/item/weapon/screwdriver) && anchored) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + user << "You [panel_open ? "open" : "close"] the maintenance panel." overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -285,7 +285,7 @@ /obj/machinery/vending/emag_act(user as mob) if(!emagged) emagged = 1 - user << "You short out the product lock on [src]." + user << "You short out the product lock on [src]." /obj/machinery/vending/attack_paw(mob/user) return attack_hand(user) @@ -431,7 +431,7 @@ return else if(R in coin_records) if(!coin) - usr << "You need to insert a coin to get this item." + usr << "You need to insert a coin to get this item!" vend_ready = 1 return if(coin.string_attached) @@ -440,11 +440,11 @@ usr << "You successfully pull [coin] out before [src] could swallow it." coin = null else - usr << "You couldn't pull [coin] out because your hands are full." + usr << "You couldn't pull [coin] out because your hands are full!" qdel(coin) coin = null else - usr << "You weren't able to pull [coin] out fast enough, the machine ate it, string and all." + usr << "You weren't able to pull [coin] out fast enough, the machine ate it, string and all!" qdel(coin) coin = null else @@ -779,6 +779,7 @@ products = list(/obj/item/weapon/restraints/handcuffs = 8,/obj/item/weapon/restraints/handcuffs/cable/zipties = 10,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash/handheld = 5, /obj/item/weapon/reagent_containers/food/snacks/donut = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/device/flashlight/seclite = 4) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/fancy/donut_box = 2) + premium = list(/obj/item/weapon/coin/antagtoken = 1) /obj/machinery/vending/hydronutrients name = "\improper NutriMax" diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 2079cf376e7..0288d3c3fba 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -248,7 +248,7 @@ user << "This item does not fit." return if(W.flags & NODROP) //if "can't drop" item - user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" + user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" return if(contents.len < 5) @@ -257,9 +257,9 @@ W.loc = src state = 3 else - user << "You can't put the item in right now." + user << "You can't put the item in right now!" else - user << "The washing machine is full." + user << "The washing machine is full!" else ..() update_icon() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 486d47a003c..adef813adc0 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -42,24 +42,24 @@ if(!istype(target)) return if(target.buckled) - occupant_message("[target] will not fit into the sleeper because they are buckled to [target.buckled].") + occupant_message("[target] will not fit into the sleeper because they are buckled to [target.buckled]!") return if(occupant) - occupant_message("The sleeper is already occupied") + occupant_message("The sleeper is already occupied!") return for(var/mob/living/simple_animal/slime/M in range(1,target)) if(M.Victim == target) - occupant_message("[target] will not fit into the sleeper because they have a slime latched onto their head.") + occupant_message("[target] will not fit into the sleeper because they have a slime latched onto their head!") return - occupant_message("You start putting [target] into [src].") - chassis.visible_message("[chassis] starts putting [target] into \the [src].") + occupant_message("You start putting [target] into [src]...") + chassis.visible_message("[chassis] starts putting [target] into \the [src].") var/C = chassis.loc var/T = target.loc if(do_after_cooldown(target)) if(chassis.loc!=C || target.loc!=T) return if(occupant) - occupant_message("The sleeper is already occupied!") + occupant_message("The sleeper is already occupied!") return target.forceMove(src) occupant = target @@ -72,7 +72,7 @@ set_ready_state(0) pr_mech_sleeper.start() occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") - chassis.visible_message("[chassis] loads [target] into [src].") + chassis.visible_message("[chassis] loads [target] into [src].") log_message("[target] loaded. Life support functions engaged.") return @@ -95,7 +95,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/sleeper/detach() if(occupant) - occupant_message("Unable to detach [src] - equipment occupied.") + occupant_message("Unable to detach [src] - equipment occupied!") return pr_mech_sleeper.stop() return ..() diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 472fceaa045..fb3c28a3d27 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -47,12 +47,12 @@ 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.") + occupant_message("You must hold still while handling objects!") O.anchored = initial(O.anchored) else - occupant_message("Not enough room in cargo compartment.") + occupant_message("Not enough room in cargo compartment!") else - occupant_message("[target] is firmly secured.") + occupant_message("[target] is firmly secured!") else if(istype(target,/mob/living)) var/mob/living/M = target @@ -65,7 +65,7 @@ M.updatehealth() target.visible_message("[chassis] squeezes [target].", \ "[chassis] squeezes [target].",\ - "You hear something crack") + "You hear something crack.") add_logs(chassis.occupant, M, "attacked", object="[name]", addition="(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") else step_away(M,chassis) @@ -93,9 +93,9 @@ return set_ready_state(0) chassis.use_power(energy_drain) - target.visible_message("[chassis] starts to drill [target]", \ - "[chassis] starts to drill [target]", \ - "You hear drilling.") + target.visible_message("[chassis] starts to drill [target].", \ + "[chassis] starts to drill [target]...", \ + "You hear drilling.") var/T = chassis.loc var/C = target.loc //why are these backwards? we may never know -Pete if(do_after_cooldown(target)) @@ -1056,7 +1056,7 @@ var/result = load_fuel(target) var/message if(isnull(result)) - message = "[fuel] traces in target minimal. [target] cannot be used as fuel." + message = "[fuel] traces in target minimal! [target] cannot be used as fuel." else if(!result) message = "Unit is full." else @@ -1214,12 +1214,12 @@ 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.") + chassis.occupant_message("You must hold still while handling objects!") O.anchored = initial(O.anchored) else - chassis.occupant_message("Not enough room in cargo compartment.") + chassis.occupant_message("Not enough room in cargo compartment!") else - chassis.occupant_message("[target] is firmly secured.") + chassis.occupant_message("[target] is firmly secured!") else if(istype(target,/mob/living)) var/mob/living/M = target diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 4b4f714f6dd..fc8d60e2263 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -500,7 +500,7 @@ default_deconstruction_crowbar(W) return 1 else - user << "You can't load \the [name] while it's opened." + user << "You can't load \the [name] while it's opened!" return 1 if(istype(W, /obj/item/stack)) @@ -526,10 +526,10 @@ return ..() if(being_built) - user << "\The [src] is currently processing. Please wait until completion." + user << "\The [src] is currently processing! Please wait until completion." return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator - user << "\The [src] [material2name(material)] storage is full." + user << "\The [src] [material2name(material)] storage is full!" return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -539,12 +539,12 @@ var/transfer_amount = min(stack.amount, round((res_max_amount - resources[material])/MINERAL_MATERIAL_AMOUNT,1)) resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) - user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." + user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else - user << "\The [src] cannot hold any more [sname] sheet\s." + user << "\The [src] cannot hold any more [sname] sheet\s!" return /obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2e9ddccfaaf..42d25b93a92 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -348,15 +348,15 @@ obj/mecha/proc/can_use(mob/user) return if(user != src.occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) - user << "You climb out from [src]" + user << "You climb out from [src]." return 0 if(connected_port) if(world.time - last_message > 20) - src.occupant_message("Unable to move while connected to the air system port") + src.occupant_message("Unable to move while connected to the air system port!") last_message = world.time return 0 if(state) - occupant_message("Maintenance protocols in effect") + occupant_message("Maintenance protocols in effect.") return return domove(direction) @@ -677,9 +677,9 @@ obj/mecha/proc/can_use(mob/user) if(E.can_attach(src)) user.drop_item() E.attach(src) - user.visible_message("[user] attaches [W] to [src]", "You attach [W] to [src]") + user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].") else - user << "You were unable to attach [W] to [src]" + user << "You were unable to attach [W] to [src]!" return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(add_req_access || maint_access) @@ -699,18 +699,18 @@ obj/mecha/proc/can_use(mob/user) else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 - user << "You undo the securing bolts." + user << "You undo the securing bolts." else if(state==2) state = 1 - user << "You tighten the securing bolts." + user << "You tighten the securing bolts." return else if(istype(W, /obj/item/weapon/crowbar)) if(state==2) state = 3 - user << "You open the hatch to the power unit" + user << "You open the hatch to the power unit." else if(state==3) state=2 - user << "You close the hatch to the power unit" + user << "You close the hatch to the power unit." return else if(istype(W, /obj/item/stack/cable_coil)) if(state == 3 && hasInternalDamage(MECHA_INT_SHORT_CIRCUIT)) @@ -719,35 +719,35 @@ obj/mecha/proc/can_use(mob/user) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) user << "You replace the fused wires." else - user << "You need two lengths of cable to fix this mecha." + user << "You need two lengths of cable to fix this mech!" return else if(istype(W, /obj/item/weapon/screwdriver)) if(hasInternalDamage(MECHA_INT_TEMP_CONTROL)) clearInternalDamage(MECHA_INT_TEMP_CONTROL) - user << "You repair the damaged temperature controller." + user << "You repair the damaged temperature controller." else if(state==3 && src.cell) src.cell.forceMove(src.loc) src.cell = null state = 4 - user << "You unscrew and pry out the powercell." + user << "You unscrew and pry out the powercell." src.log_message("Powercell removed") else if(state==4 && src.cell) state=3 - user << "You screw the cell in place" + user << "You screw the cell in place." return else if(istype(W, /obj/item/weapon/stock_parts/cell)) if(state==4) if(!src.cell) var/obj/item/weapon/stock_parts/cell/C = W - user << "You install the powercell" + user << "You install the powercell." user.drop_item() C.forceMove(src) C.use(C.charge * 0.8) src.cell = C src.log_message("Powercell installed") else - user << "There's already a powercell installed." + user << "There's already a powercell installed." return else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") @@ -762,18 +762,18 @@ obj/mecha/proc/can_use(mob/user) user.visible_message("[user] repairs some damage to [src.name].") src.health += min(10, initial(src.health)-src.health) else - user << "The welder must be on for this task." + user << "The welder must be on for this task!" return 1 else - user << "The [src.name] is at full integrity." + user << "The [src.name] is at full integrity!" return 1 else if(istype(W, /obj/item/mecha_parts/mecha_tracking)) if(!user.unEquip(W)) - user << "\the [W] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [W] is stuck to your hand, you cannot put it in \the [src]!" return W.forceMove(src) - user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") + user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].") return else if(!(W.flags&NOBLUDGEON)) @@ -949,20 +949,20 @@ obj/mecha/proc/can_use(mob/user) return for(var/mob/living/simple_animal/slime/S in range(1,user)) if(S.Victim == user) - user << "You're too busy getting your life sucked out of you." + user << "You're too busy getting your life sucked out of you!" return - visible_message("[user] starts to climb into [src.name]") + visible_message("[user] starts to climb into [src.name].") if(enter_after(40,user)) if(src.health <= 0) - user << "You cannot get in the [src.name], it has been destroyed." + user << "You cannot get in the [src.name], it has been destroyed!" else if(!src.occupant) moved_inside(user) else if(src.occupant!=user) - user << "[src.occupant] was faster. Try better next time, loser." + user << "[src.occupant] was faster! Try better next time, loser." else - user << "You stop entering the exosuit." + user << "You stop entering the exosuit!" return /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -993,41 +993,41 @@ obj/mecha/proc/can_use(mob/user) /obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + user << "Consciousness matrix not detected!" return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + user << "Beta-rhythm below acceptable level!" return 0 else if(occupant) - user << "Occupant detected." + user << "Occupant detected!" return 0 else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) - user << "Stop it!" + user << "Stop it!" return 0 //Added a message here since people assume their first click failed or something./N // user << "Installing MMI, please stand by." - visible_message("[user] starts to insert an MMI into [src.name]") + visible_message("[user] starts to insert an MMI into [src.name].") if(enter_after(40,user)) if(!occupant) return mmi_moved_inside(mmi_as_oc,user) else - user << "Occupant detected." + user << "Occupant detected!" else - user << "You stop inserting the MMI." + user << "You stop inserting the MMI." return 0 /obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + user << "Consciousness matrix not detected!" return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + user << "Beta-rhythm below acceptable level!" return 0 if(!user.unEquip(mmi_as_oc)) - user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]!" return var/mob/brainmob = mmi_as_oc.brainmob brainmob.reset_view(src) @@ -1527,7 +1527,7 @@ var/year_integer = text2num(year) // = 2013??? src.dna = null if(href_list["repair_int_control_lost"]) if(usr != src.occupant) return - src.occupant_message("Recalibrating coordination system.") + src.occupant_message("Recalibrating coordination system...") src.log_message("Recalibration of coordination system started.") var/T = src.loc if(do_after(100)) @@ -1536,7 +1536,7 @@ var/year_integer = text2num(year) // = 2013??? src.occupant_message("Recalibration successful.") src.log_message("Recalibration of coordination system finished with 0 errors.") else - src.occupant_message("Recalibration failed.") + src.occupant_message("Recalibration failed!") src.log_message("Recalibration of coordination system failed with 1 error.",1) //debug diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index e7b20468d4d..12977e75648 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -23,12 +23,12 @@ if(C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + user << ("There's not enough cable to finish the task!") return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + user << ("There's not enough material in this stack!") return 0 else S.use(5) @@ -55,12 +55,12 @@ if (C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + user << ("There's not enough cable to finish the task!") return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + user << ("There's not enough material in this stack!") return 0 else S.use(5) @@ -76,7 +76,7 @@ ) /datum/construction/mecha/ripley_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -165,107 +165,107 @@ //TODO: better messages. switch(index) if(14) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "ripley1" if(13) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "ripley2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "ripley0" if(12) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "ripley3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "ripley1" if(11) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "ripley4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "ripley2" if(10) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "ripley5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "ripley3" if(9) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "ripley6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "ripley4" if(8) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "ripley7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "ripley5" if(7) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "ripley8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "ripley6" if(6) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") holder.icon_state = "ripley9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "ripley7" if(5) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") holder.icon_state = "ripley10" else - user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") + user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 holder.icon_state = "ripley8" if(4) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") + user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") holder.icon_state = "ripley11" else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") holder.icon_state = "ripley9" if(3) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") + user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") holder.icon_state = "ripley12" else - user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") + user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") holder.icon_state = "ripley10" if(2) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") holder.icon_state = "ripley13" else - user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") + user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 holder.icon_state = "ripley11" if(1) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") holder.icon_state = "ripley12" return 1 @@ -286,7 +286,7 @@ ) /datum/construction/mecha/gygax_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -398,155 +398,155 @@ //TODO: better messages. switch(index) if(20) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "gygax1" if(19) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "gygax2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "gygax0" if(18) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "gygax3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "gygax1" if(17) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "gygax4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "gygax2" if(16) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "gygax5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "gygax3" if(15) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "gygax6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/gygax/main(get_turf(holder)) holder.icon_state = "gygax4" if(14) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "gygax7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "gygax5" if(13) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "gygax8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/gygax/peripherals(get_turf(holder)) holder.icon_state = "gygax6" if(12) if(diff==FORWARD) - user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") + user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) holder.icon_state = "gygax9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "gygax7" if(11) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "gygax10" else - user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") + user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/gygax/targeting(get_turf(holder)) holder.icon_state = "gygax8" if(10) if(diff==FORWARD) - user.visible_message("[user] installs advanced scanner module to the [holder].", "You install advanced scanner module to the [holder].") + user.visible_message("[user] installs advanced scanner module to the [holder].", "You install advanced scanner module to the [holder].") qdel(used_atom) holder.icon_state = "gygax11" else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "gygax9" if(9) if(diff==FORWARD) - user.visible_message("[user] secures the advanced scanner module.", "You secure the advanced scanner module.") + user.visible_message("[user] secures the advanced scanner module.", "You secure the advanced scanner module.") holder.icon_state = "gygax12" else - user.visible_message("[user] removes the advanced scanner module from the [holder].", "You remove the advanced scanner module from the [holder].") + user.visible_message("[user] removes the advanced scanner module from the [holder].", "You remove the advanced scanner module from the [holder].") new /obj/item/weapon/stock_parts/scanning_module/adv(get_turf(holder)) holder.icon_state = "gygax10" if(8) if(diff==FORWARD) - user.visible_message("[user] installs advanced capacitor to the [holder].", "You install advanced capacitor to the [holder].") + user.visible_message("[user] installs advanced capacitor to the [holder].", "You install advanced capacitor to the [holder].") qdel(used_atom) holder.icon_state = "gygax13" else - user.visible_message("[user] unfastens the advanced scanner module.", "You unfasten the advanced scanner module.") + user.visible_message("[user] unfastens the advanced scanner module.", "You unfasten the advanced scanner module.") holder.icon_state = "gygax11" if(7) if(diff==FORWARD) - user.visible_message("[user] secures the advanced capacitor.", "You secure the advanced capacitor.") + user.visible_message("[user] secures the advanced capacitor.", "You secure the advanced capacitor.") holder.icon_state = "gygax14" else - user.visible_message("[user] removes the advanced capacitor from the [holder].", "You remove the advanced capacitor from the [holder].") + user.visible_message("[user] removes the advanced capacitor from the [holder].", "You remove the advanced capacitor from the [holder].") new /obj/item/weapon/stock_parts/capacitor/adv(get_turf(holder)) holder.icon_state = "gygax12" if(6) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") holder.icon_state = "gygax15" else - user.visible_message("[user] unfastens the advanced capacitor.", "You unfasten the advanced capacitor.") + user.visible_message("[user] unfastens the advanced capacitor.", "You unfasten the advanced capacitor.") holder.icon_state = "gygax13" if(5) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") holder.icon_state = "gygax16" else - user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") + user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 holder.icon_state = "gygax14" if(4) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") + user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") holder.icon_state = "gygax17" else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") holder.icon_state = "gygax15" if(3) if(diff==FORWARD) - user.visible_message("[user] installs Gygax Armor Plates to the [holder].", "You install Gygax Armor Plates to the [holder].") + user.visible_message("[user] installs Gygax Armor Plates to the [holder].", "You install Gygax Armor Plates to the [holder].") qdel(used_atom) holder.icon_state = "gygax18" else - user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") + user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") holder.icon_state = "gygax16" if(2) if(diff==FORWARD) - user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.") + user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.") holder.icon_state = "gygax19" else - user.visible_message("[user] pries Gygax Armor Plates from the [holder].", "You pry Gygax Armor Plates from the [holder].") + user.visible_message("[user] pries Gygax Armor Plates from the [holder].", "You pry Gygax Armor Plates from the [holder].") new /obj/item/mecha_parts/part/gygax_armor(get_turf(holder)) holder.icon_state = "gygax17" if(1) if(diff==FORWARD) - user.visible_message("[user] welds Gygax Armor Plates to the [holder].", "You weld Gygax Armor Plates to the [holder].") + user.visible_message("[user] welds Gygax Armor Plates to the [holder].", "You weld Gygax Armor Plates to the [holder].") else - user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.") + user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.") holder.icon_state = "gygax18" return 1 @@ -565,7 +565,7 @@ ) /datum/construction/mecha/firefighter_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -658,117 +658,117 @@ //TODO: better messages. switch(index) if(15) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "fireripley1" if(14) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "fireripley2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "fireripley0" if(13) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "fireripley3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "fireripley1" if(12) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "fireripley4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "fireripley2" if(11) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "fireripley5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "fireripley3" if(10) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "fireripley6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "fireripley4" if(9) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "fireripley7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "fireripley5" if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "fireripley8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "fireripley6" if(7) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") holder.icon_state = "fireripley9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "fireripley7" if(6) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") holder.icon_state = "fireripley10" else - user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") + user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 holder.icon_state = "fireripley8" if(5) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") + user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") holder.icon_state = "fireripley11" else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") holder.icon_state = "fireripley9" if(4) if(diff==FORWARD) - user.visible_message("[user] starts to install the external armor layer to the [holder].", "You start to install the external armor layer to the [holder].") + user.visible_message("[user] starts to install the external armor layer to the [holder].", "You install the external armor layer to the [holder].") holder.icon_state = "fireripley12" else - user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") + user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") holder.icon_state = "fireripley10" if(3) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") + user.visible_message("[user] installs the external reinforced armor layer to the [holder].", "You install the external reinforced armor layer to the [holder].") holder.icon_state = "fireripley13" else - user.visible_message("[user] removes the external armor from the [holder].", "You remove the external armor from the [holder].") + user.visible_message("[user] removes the external armor from the [holder].", "You remove the external armor from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 holder.icon_state = "fireripley11" if(2) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") holder.icon_state = "fireripley14" else - user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") + user.visible_message("[user] pries external armor layer from the [holder].", "You pry external armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 holder.icon_state = "fireripley12" if(1) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") holder.icon_state = "fireripley13" return 1 @@ -792,7 +792,7 @@ return check_all_steps(used_atom,user) /datum/construction/mecha/honker_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -834,19 +834,19 @@ //TODO: better messages. switch(step) if(10) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") qdel(used_atom) if(8) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) if(6) - user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") + user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) if(4) - user.visible_message("[user] puts clown wig and mask on the [holder].", "You put clown wig and mask on the [holder].") + user.visible_message("[user] puts clown wig and mask on the [holder].", "You put clown wig and mask on the [holder].") qdel(used_atom) if(2) - user.visible_message("[user] puts clown boots on the [holder].", "You put clown boots on the [holder].") + user.visible_message("[user] puts clown boots on the [holder].", "You put clown boots on the [holder].") qdel(used_atom) return 1 @@ -977,155 +977,155 @@ //TODO: better messages. switch(index) if(20) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "durand1" if(19) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "durand2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "durand0" if(18) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "durand3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "durand1" if(17) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "durand4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "durand2" if(16) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "durand5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "durand3" if(15) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "durand6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/durand/main(get_turf(holder)) holder.icon_state = "durand4" if(14) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "durand7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "durand5" if(13) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "durand8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/durand/peripherals(get_turf(holder)) holder.icon_state = "durand6" if(12) if(diff==FORWARD) - user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") + user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) holder.icon_state = "durand9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "durand7" if(11) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "durand10" else - user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") + user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/durand/targeting(get_turf(holder)) holder.icon_state = "durand8" if(10) if(diff==FORWARD) - user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].") + user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].") qdel(used_atom) holder.icon_state = "durand11" else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "durand9" if(9) if(diff==FORWARD) - user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.") + user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.") holder.icon_state = "durand12" else - user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].") + user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].") new /obj/item/weapon/stock_parts/scanning_module/phasic(get_turf(holder)) holder.icon_state = "durand10" if(8) if(diff==FORWARD) - user.visible_message("[user] installs super capacitor to the [holder].", "You install super capacitor to the [holder].") + user.visible_message("[user] installs super capacitor to the [holder].", "You install super capacitor to the [holder].") qdel(used_atom) holder.icon_state = "durand13" else - user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") + user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") holder.icon_state = "durand11" if(7) if(diff==FORWARD) - user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.") + user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.") holder.icon_state = "durand14" else - user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the super capacitor from the [holder].") + user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the super capacitor from the [holder].") new /obj/item/weapon/stock_parts/capacitor/super(get_turf(holder)) holder.icon_state = "durand12" if(6) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") holder.icon_state = "durand15" else - user.visible_message("[user] unfastens the super capacitor.", "You unfasten the super capacitor.") + user.visible_message("[user] unfastens the super capacitor.", "You unfasten the super capacitor.") holder.icon_state = "durand13" if(5) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") holder.icon_state = "durand16" else - user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") + user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 holder.icon_state = "durand14" if(4) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") + user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") holder.icon_state = "durand17" else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") holder.icon_state = "durand15" if(3) if(diff==FORWARD) - user.visible_message("[user] installs Durand Armor Plates to the [holder].", "You install Durand Armor Plates to the [holder].") + user.visible_message("[user] installs Durand Armor Plates to the [holder].", "You install Durand Armor Plates to the [holder].") qdel(used_atom) holder.icon_state = "durand18" else - user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") + user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") holder.icon_state = "durand16" if(2) if(diff==FORWARD) - user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.") + user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.") holder.icon_state = "durand19" else - user.visible_message("[user] pries Durand Armor Plates from the [holder].", "You pry Durand Armor Plates from the [holder].") + user.visible_message("[user] pries Durand Armor Plates from the [holder].", "You pry Durand Armor Plates from the [holder].") new /obj/item/mecha_parts/part/durand_armor(get_turf(holder)) holder.icon_state = "durand17" if(1) if(diff==FORWARD) - user.visible_message("[user] welds Durand Armor Plates to the [holder].", "You weld Durand Armor Plates to the [holder].") + user.visible_message("[user] welds Durand Armor Plates to the [holder].", "You weld Durand Armor Plates to the [holder].") else - user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.") + user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.") holder.icon_state = "durand18" return 1 @@ -1147,7 +1147,7 @@ ) /datum/construction/mecha/phazon_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -1276,182 +1276,182 @@ //TODO: better messages. switch(index) if(24) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "phazon1" if(23) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "phazon2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "phazon0" if(22) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "phazon3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "phazon1" if(21) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "phazon4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "phazon2" if(20) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "phazon5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "phazon3" if(19) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "phazon6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/phazon/main(get_turf(holder)) holder.icon_state = "phazon4" if(18) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "phazon7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "phazon5" if(17) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "phazon8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/phazon/peripherals(get_turf(holder)) holder.icon_state = "phazon6" if(16) if(diff==FORWARD) - user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") + user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") qdel(used_atom) holder.icon_state = "phazon9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "phazon7" if(15) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") holder.icon_state = "phazon10" else - user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") + user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/phazon/targeting(get_turf(holder)) holder.icon_state = "phazon8" if(14) if(diff==FORWARD) - user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].") + user.visible_message("[user] installs phasic scanner module to the [holder].", "You install phasic scanner module to the [holder].") qdel(used_atom) holder.icon_state = "phazon11" else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") holder.icon_state = "phazon9" if(13) if(diff==FORWARD) - user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.") + user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.") holder.icon_state = "phazon12" else - user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].") + user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the phasic scanner module from the [holder].") new /obj/item/weapon/stock_parts/scanning_module/phasic(get_turf(holder)) holder.icon_state = "phazon10" if(12) if(diff==FORWARD) - user.visible_message("[user] installs super capacitor to the [holder].", "You install super capacitor to the [holder].") + user.visible_message("[user] installs super capacitor to the [holder].", "You install super capacitor to the [holder].") qdel(used_atom) holder.icon_state = "phazon13" else - user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") + user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") holder.icon_state = "phazon11" if(11) if(diff==FORWARD) - user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.") + user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.") holder.icon_state = "phazon14" else - user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the super capacitor from the [holder].") + user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the super capacitor from the [holder].") new /obj/item/weapon/stock_parts/capacitor/super(get_turf(holder)) holder.icon_state = "phazon12" if(10) if(diff==FORWARD) - user.visible_message("[user] installs the bluespace crystal.", "You install the bluespace crystal.") + user.visible_message("[user] installs the bluespace crystal.", "You install the bluespace crystal.") qdel(used_atom) holder.icon_state = "phazon15" else - user.visible_message("[user] unsecures the super capacitor from the [holder].", "You unsecure the super capacitor from the [holder].") + user.visible_message("[user] unsecures the super capacitor from the [holder].", "You unsecure the super capacitor from the [holder].") holder.icon_state = "phazon13" if(9) if(diff==FORWARD) - user.visible_message("[user] connects the bluespace crystal.", "You connect the bluespace crystal.") + user.visible_message("[user] connects the bluespace crystal.", "You connect the bluespace crystal.") holder.icon_state = "phazon16" else - user.visible_message("[user] removes the bluespace crystal from the [holder].", "You remove the bluespace crystal from the [holder].") + user.visible_message("[user] removes the bluespace crystal from the [holder].", "You remove the bluespace crystal from the [holder].") new /obj/item/bluespace_crystal(get_turf(holder)) holder.icon_state = "phazon14" if(8) if(diff==FORWARD) - user.visible_message("[user] engages the bluespace crystal.", "You engage the bluespace crystal.") + user.visible_message("[user] engages the bluespace crystal.", "You engage the bluespace crystal.") holder.icon_state = "phazon17" else - user.visible_message("[user] disconnects the bluespace crystal from the [holder].", "You disconnect the bluespace crystal from the [holder].") + user.visible_message("[user] disconnects the bluespace crystal from the [holder].", "You disconnect the bluespace crystal from the [holder].") holder.icon_state = "phazon15" if(7) if(diff==FORWARD) - user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") + user.visible_message("[user] installs the phase armor layer to the [holder].", "You install the phase armor layer to the [holder].") holder.icon_state = "phazon18" else - user.visible_message("[user] disengages the bluespace crystal.", "You disengage the bluespace crystal.") + user.visible_message("[user] disengages the bluespace crystal.", "You disengage the bluespace crystal.") holder.icon_state = "phazon16" if(6) if(diff==FORWARD) - user.visible_message("[user] secures the phase armor layer.", "You secure the phase armor layer.") + user.visible_message("[user] secures the phase armor layer.", "You secure the phase armor layer.") holder.icon_state = "phazon19" else - user.visible_message("[user] pries the phase armor layer from the [holder].", "You pry the phase armor layer from the [holder].") + user.visible_message("[user] pries the phase armor layer from the [holder].", "You pry the phase armor layer from the [holder].") var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 holder.icon_state = "phazon17" if(5) if(diff==FORWARD) - user.visible_message("[user] welds the phase armor layer to the [holder].", "You weld the phase armor layer to the [holder].") + user.visible_message("[user] welds the phase armor layer to the [holder].", "You weld the phase armor layer to the [holder].") holder.icon_state = "phazon20" else - user.visible_message("[user] unfastens the phase armor layer.", "You unfasten the phase armor layer.") + user.visible_message("[user] unfastens the phase armor layer.", "You unfasten the phase armor layer.") holder.icon_state = "phazon18" if(4) if(diff==FORWARD) - user.visible_message("[user] installs Phazon Armor Plates to the [holder].", "You install Phazon Armor Plates to the [holder].") + user.visible_message("[user] installs Phazon Armor Plates to the [holder].", "You install Phazon Armor Plates to the [holder].") qdel(used_atom) holder.icon_state = "phazon21" else - user.visible_message("[user] cuts phase armor layer from the [holder].", "You cut the phase armor layer from the [holder].") + user.visible_message("[user] cuts phase armor layer from the [holder].", "You cut the phase armor layer from the [holder].") holder.icon_state = "phazon19" if(3) if(diff==FORWARD) - user.visible_message("[user] secures Phazon Armor Plates.", "You secure Phazon Armor Plates.") + user.visible_message("[user] secures Phazon Armor Plates.", "You secure Phazon Armor Plates.") holder.icon_state = "phazon22" else - user.visible_message("[user] pries Phazon Armor Plates from the [holder].", "You pry Phazon Armor Plates from the [holder].") + user.visible_message("[user] pries Phazon Armor Plates from the [holder].", "You pry Phazon Armor Plates from the [holder].") new /obj/item/mecha_parts/part/phazon_armor(get_turf(holder)) holder.icon_state = "phazon20" if(2) if(diff==FORWARD) - user.visible_message("[user] welds Phazon Armor Plates to the [holder].", "You weld Phazon Armor Plates to the [holder].") + user.visible_message("[user] welds Phazon Armor Plates to the [holder].", "You weld Phazon Armor Plates to the [holder].") else - user.visible_message("[user] unfastens Phazon Armor Plates.", "You unfasten Phazon Armor Plates.") + user.visible_message("[user] unfastens Phazon Armor Plates.", "You unfasten Phazon Armor Plates.") holder.icon_state = "phazon21" if(1) if(diff==FORWARD) - user.visible_message("[user] carefully inserts the anomaly core into \the [holder] and secures it.", "You slowly place the anomaly core into its socket and close its chamber.") + user.visible_message("[user] carefully inserts the anomaly core into \the [holder] and secures it.", "You slowly place the anomaly core into its socket and close its chamber.") qdel(used_atom) return 1 @@ -1472,7 +1472,7 @@ ) /datum/construction/mecha/odysseus_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]") + user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder].") holder.overlays += used_atom.icon_state+"+o" qdel(used_atom) return 1 @@ -1560,109 +1560,109 @@ //TODO: better messages. switch(index) if(14) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") + user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") holder.icon_state = "odysseus1" if(13) if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") + user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") holder.icon_state = "odysseus2" else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") + user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") holder.icon_state = "odysseus0" if(12) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") + user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") holder.icon_state = "odysseus3" else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") + user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") holder.icon_state = "odysseus1" if(11) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") + user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") holder.icon_state = "odysseus4" else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") + user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "odysseus2" if(10) if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") + user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") qdel(used_atom) holder.icon_state = "odysseus5" else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") + user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") holder.icon_state = "odysseus3" if(9) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") holder.icon_state = "odysseus6" else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") + user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") new /obj/item/weapon/circuitboard/mecha/odysseus/main(get_turf(holder)) holder.icon_state = "odysseus4" if(8) if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") + user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") qdel(used_atom) holder.icon_state = "odysseus7" else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") holder.icon_state = "odysseus5" if(7) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") holder.icon_state = "odysseus8" else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") + user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") new /obj/item/weapon/circuitboard/mecha/odysseus/peripherals(get_turf(holder)) holder.icon_state = "odysseus6" if(6) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") + user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].") holder.icon_state = "odysseus9" else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") holder.icon_state = "odysseus7" if(5) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") holder.icon_state = "odysseus10" else - user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") + user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].") var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder)) MS.amount = 5 holder.icon_state = "odysseus8" if(4) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") + user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].") holder.icon_state = "odysseus11" else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") holder.icon_state = "odysseus9" if(3) if(diff==FORWARD) - user.visible_message("[user] installs [used_atom] layer to the [holder].", "You install the external reinforced armor layer to the [holder].") + user.visible_message("[user] installs [used_atom] layer to the [holder].", "You install the external reinforced armor layer to the [holder].") holder.icon_state = "odysseus12" else - user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") + user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].") holder.icon_state = "odysseus10" if(2) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") holder.icon_state = "odysseus13" else var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 - user.visible_message("[user] pries [MS] from the [holder].", "You pry [MS] from the [holder].") + user.visible_message("[user] pries [MS] from the [holder].", "You pry [MS] from the [holder].") holder.icon_state = "odysseus11" if(1) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") + user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].") holder.icon_state = "odysseus14" else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") holder.icon_state = "odysseus12" return 1 diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index feeb4b6c56e..96504721e0c 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -18,34 +18,34 @@ /obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [I]." + user << "You don't see anything that can be cut with [I]!" return var/obj/item/weapon/weldingtool/WT = I if(welder_salvage && welder_salvage.len && WT.remove_fuel(0, user)) var/type = prob(70) ? pick(welder_salvage) : null if(type) var/N = new type(get_turf(user)) - user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") + user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") if(istype(N, /obj/item/mecha_parts/part)) welder_salvage -= type salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + user << "You fail to salvage anything valuable from [src]!" else return if(istype(I, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [I]." + user << "You don't see anything that can be cut with [I]!" return else if(wirecutters_salvage && wirecutters_salvage.len) var/type = prob(70) ? pick(wirecutters_salvage) : null if(type) var/N = new type(get_turf(user)) - user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") + user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + user << "You fail to salvage anything valuable from [src]!" if(istype(I, /obj/item/weapon/crowbar)) if(crowbar_salvage && crowbar_salvage.len) @@ -53,10 +53,10 @@ if(S) S.loc = get_turf(user) crowbar_salvage -= S - user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") + user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") return else - user << "You don't see anything that can be pried with [I]." + user << "You don't see anything that can be pried with [I]!" else ..() diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index ffc4db6400c..be8d9fccbc3 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -74,14 +74,14 @@ if(buckle_mob(M)) if(M == user) M.visible_message(\ - "[M.name] buckles themselves to [src].",\ + "[M.name] buckles themselves to [src].",\ "You buckle yourself to [src].",\ - "You hear metal clanking.") + "You hear metal clanking.") else M.visible_message(\ - "[M.name] is buckled to [src] by [user.name]!",\ + "[M.name] is buckled to [src] by [user.name]!",\ "You are buckled to [src] by [user.name]!",\ - "You heat metal clanking.") + "You heat metal clanking.") /obj/proc/user_unbuckle_mob(mob/user) var/mob/living/M = unbuckle_mob() @@ -89,14 +89,14 @@ if(M) if(M != user) M.visible_message(\ - "[M.name] was unbuckled by [user.name]!",\ + "[M.name] was unbuckled by [user.name].",\ "You were unbuckled from [src] by [user.name].",\ - "You hear metal clanking.") + "You hear metal clanking.") else M.visible_message(\ "[M.name] unbuckled themselves!",\ "You unbuckled yourself from [src].",\ - "You hear metal clanking.") + "You hear metal clanking.") add_fingerprint(user) return M diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 00615da6e0e..2fbe83f9bf5 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -322,7 +322,7 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if("Yes") if( user.loc != temp_loc || ruined ) return - visible_message("[user] rips [src] in a single, decisive motion!" ) + visible_message("[user] rips [src] in a single, decisive motion!" ) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) ruined = 1 icon_state = "poster_ripped" @@ -346,11 +346,11 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) var/stuff_on_wall = 0 for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff if(istype(O,/obj/structure/sign/poster)) - user << "The wall is far too cluttered to place a poster!" + user << "The wall is far too cluttered to place a poster!" return stuff_on_wall++ if(stuff_on_wall == 3) - user << "The wall is far too cluttered to place a poster!" + user << "The wall is far too cluttered to place a poster!" return user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster. diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 7c460171a90..8aca6f11748 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -18,6 +18,9 @@ name = e_name desc = "A [name] drawn in crayon." + if(type == "poseur tag") + gang_name() //Generate gang names so they get removed from the pool + type = pick(gang_name_pool) icon_state = type var/matrix/M = matrix() @@ -35,38 +38,30 @@ qdel(src) var/area/territory = get_area(location) - var/list/recipients = list() var/color if(type == "A") gang = type color = "#00b4ff" icon_state = gang_name("A") - recipients = ticker.mode.A_tools - ticker.mode.A_territory |= territory.type + ticker.mode.A_territory_new |= list(territory.type = territory.name) + ticker.mode.A_territory_lost -= territory.type else if(type == "B") gang = type color = "#ff3232" icon_state = gang_name("B") - recipients = ticker.mode.B_tools - ticker.mode.B_territory |= territory.type - - if(recipients.len) - ticker.mode.message_gangtools(recipients,"New territory claimed: [territory]",0) + ticker.mode.B_territory_new |= list(territory.type = territory.name) + ticker.mode.B_territory_lost -= territory.type ..(location, color, icon_state, e_name, rotation) /obj/effect/decal/cleanable/crayon/gang/Destroy() var/area/territory = get_area(src) - var/list/recipients = list() if(gang == "A") - recipients += ticker.mode.A_tools - ticker.mode.A_territory -= territory.type + ticker.mode.A_territory_new -= territory.type + ticker.mode.A_territory_lost |= list(territory.type = territory.name) if(gang == "B") - recipients += ticker.mode.B_tools - ticker.mode.B_territory -= territory.type - if(recipients.len) - ticker.mode.message_gangtools(recipients,"Territory lost: [territory]",0) - + ticker.mode.B_territory_new -= territory.type + ticker.mode.B_territory_lost |= list(territory.type = territory.name) ..() \ No newline at end of file diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 8bb92d6e51e..a116645b9d5 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -222,14 +222,14 @@ /obj/structure/foamedmetal/attack_hulk(mob/living/carbon/human/user) ..(user, 1) if(prob(75 - metal*25)) - user.visible_message("[user] smashes through the foamed metal.", \ - "You smash through the metal foam wall.") + user.visible_message("[user] smashes through the foamed metal!", \ + "You smash through the metal foam wall!") qdel(src) return 1 /obj/structure/foamedmetal/attack_hand(var/mob/user) - user << "You hit the metal foam but bounce off it." + user << "You hit the metal foam but bounce off it!" /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) @@ -242,11 +242,11 @@ return if(prob(I.force*20 - metal*25)) - user.visible_message("[user] smashes through the foamed metal.", \ - "You smash through the foamed metal with \the [I].") + user.visible_message("[user] smashes through the foamed metal!", \ + "You smash through the foamed metal with \the [I]!") qdel(src) else - user << "You hit the metal foam to no effect." + user << "You hit the metal foam to no effect!" /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5) diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 93219cb61b4..30f2be1dd2d 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -75,7 +75,7 @@ /datum/effect/effect/system/reagents_explosion/start() if(explosion_message) location.visible_message("The solution violently explodes!", \ - "You hear an explosion!") + "You hear an explosion!") if (amount <= 2) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, location) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index e820cc57eaf..b680e468d13 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -141,7 +141,7 @@ var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents) if(prob(50)) visible_message("[src] scrambles into the ventillation ducts!", \ - "You hear something squeezing through the ventilation ducts.") + "You hear something scampering through the ventilation ducts.") spawn(rand(20,60)) loc = exit_vent @@ -154,7 +154,7 @@ return if(prob(50)) - audible_message("You hear something squeezing through the ventilation ducts.") + audible_message("You hear something scampering through the ventilation ducts.") sleep(travel_time) if(!exit_vent || exit_vent.welded) @@ -233,7 +233,7 @@ var/breakout_time = 2 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You struggle against the tight bonds! (This will take about [breakout_time] minutes.)" + user << "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)" visible_message("You see something struggling and writhing in \the [src]!") if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src) @@ -243,7 +243,7 @@ /obj/effect/spider/cocoon/Destroy() - src.visible_message("\The [src] splits open.") + src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc ..() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 045886e7065..f81bb41f659 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -193,7 +193,7 @@ if(!A.has_fine_manipulation || w_class >= 4) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) - user << "Your claws aren't capable of such fine manipulation." + user << "Your claws aren't capable of such fine manipulation!" return attack_paw(A) @@ -235,7 +235,7 @@ else if(success) user << "You put some things [S.preposition] [S]." else - user << "You fail to pick anything up with [S]." + user << "You fail to pick anything up with [S]!" else if(S.can_be_inserted(src)) S.handle_item_insertion(src) @@ -302,7 +302,7 @@ usr << "\red You already have something in your hand." */ else - usr << "This mob type can't use this verb." + usr << "This mob type can't use this verb!" //This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'action_button_name'. //The default action is attack_self(). @@ -325,7 +325,7 @@ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) // you can't stab someone in the eyes wearing a mask! - user << "You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first!" return var/mob/living/carbon/monkey/Mo = M @@ -333,11 +333,11 @@ (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \ )) // you can't stab someone in the eyes wearing a mask! - user << "You're going to need to remove that mask/helmet/glasses first." + user << "You're going to need to remove that mask/helmet/glasses first!" return if(isalien(M))//Aliens don't have eyes./N slimes also don't have eyes! - user << "You cannot locate any eyes on this creature!" + user << "You cannot locate any eyes on this creature!" return add_logs(user, M, "attacked", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])") @@ -403,6 +403,9 @@ /obj/item/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) . = 1 + if(unacidable) + return + for(var/V in armor) if(armor[V] > 0) .-- //it survives the acid... diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index af2552dded1..be9e287bb22 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -22,22 +22,22 @@ var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "APC cannot be placed on this spot." + usr << "APC cannot be placed on this spot!" return if (A.requires_power == 0 || istype(A, /area/space)) - usr << "APC cannot be placed in this area." + usr << "APC cannot be placed in this area!" return if (A.get_apc()) - usr << "This area already has APC." + usr << "This area already has APC!" return //only one APC per area for(var/obj/machinery/power/terminal/T in loc) if (T.master) - usr << "There is another network terminal here." + usr << "There is another network terminal here!" return else var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) C.amount = 10 - usr << "You cut the cables and disassemble the unused power terminal." + usr << "You cut the cables and disassemble the unused power terminal." qdel(T) new /obj/machinery/power/apc(loc, ndir, 1) qdel(src) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 1a120d0f33b..2013d180b59 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -88,6 +88,7 @@ /obj/item/toy/crayon/spraycan icon_state = "spraycan_cap" + item_state = "spraycan" desc = "A metallic container containing tasty paint." var/capped = 1 instant = 1 @@ -132,9 +133,9 @@ if(iscarbon(target)) if(uses) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - uses = max(0,uses-10) var/mob/living/carbon/human/C = target - user.visible_message(" [user] sprays [src] into the face of [target]!") + user.visible_message("[user] sprays [src] into the face of [target]!") + target << "[user] sprays [src] into your face!" if(C.client) C.eye_blurry = max(C.eye_blurry, 3) C.eye_blind = max(C.eye_blind, 1) @@ -144,6 +145,7 @@ C.lip_style = "spray_face" C.lip_color = colour C.update_body() + uses = max(0,uses-10) ..() /obj/item/toy/crayon/spraycan/update_icon() @@ -156,4 +158,5 @@ desc = "A suspicious-looking spraycan modified to use special paint used by gangsters to mark territory." icon_state = "spraycan_gang_cap" gang = 1 - instant = -1 \ No newline at end of file + uses = 15 + instant = -1 diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e93ceeb89dc..4ef33585421 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -864,9 +864,9 @@ var/global/list/obj/item/device/pda/PDAs = list() if(id) remove_id() else - usr << "This PDA does not have an ID in it." + usr << "This PDA does not have an ID in it!" else - usr << "You cannot do this while restrained." + usr << "You cannot do that while restrained!" /obj/item/device/pda/verb/verb_remove_id() set category = "Object" @@ -880,9 +880,9 @@ var/global/list/obj/item/device/pda/PDAs = list() if(id) remove_id() else - usr << "This PDA does not have an ID in it." + usr << "This PDA does not have an ID in it!" else - usr << "You cannot do this while restrained." + usr << "You cannot do that while restrained!" /obj/item/device/pda/verb/verb_remove_pen() @@ -904,9 +904,9 @@ var/global/list/obj/item/device/pda/PDAs = list() return O.loc = get_turf(src) else - usr << "This PDA does not have a pen in it." + usr << "This PDA does not have a pen in it!" else - usr << "You cannot do this while restrained." + usr << "You cannot do that while restrained!" /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. if(choice == 1) @@ -942,7 +942,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else if(istype(C, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/idcard = C if(!idcard.registered_name) - user << "\The [src] rejects the ID." + user << "\The [src] rejects the ID!" return if(!owner) owner = idcard.registered_name @@ -967,7 +967,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else if(istype(C, /obj/item/weapon/pen)) var/obj/item/weapon/pen/O = locate() in src if(O) - user << "There is already a pen in \the [src]." + user << "There is already a pen in \the [src]!" else user.drop_item() C.loc = src @@ -1030,7 +1030,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) if (!A:info) - user << "Unable to scan. Paper is blank." + user << "Unable to scan! Paper is blank." return notehtml = A:info note = replacetext(notehtml, "
", "\[br\]") diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 6d5c687803b..64c7c3d270f 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -249,11 +249,11 @@ var/obj/machinery/camera/C = locate(href_list["view"]) if(istype(C)) if(!C.can_use()) - usr << "Something's wrong with that camera. You can't get a feed." + usr << "Something's wrong with that camera! You can't get a feed." return var/turf/T = get_turf(loc) if(!T || C.z != T.z) - usr << "You can't get a signal." + usr << "You can't get a signal!" return current = C spawn(6) @@ -311,7 +311,7 @@ /obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) - user << "You unscrew [expansion]." + user << "You unscrew [expansion]." user.put_in_inactive_hand(expansion) expansion = null bugtype = VANILLA_BUG @@ -352,7 +352,7 @@ user.drop_item() W.loc = src expansion = W - user << "You add [W] to [src]." + user << "You add [W] to [src]." get_cameras() // the tracking code will want to know the new camera list if(bugtype in list(UNIVERSAL_BUG,NETWORK_BUG,ADMIN_BUG)) skip_bugcheck = 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 333bcb0c658..8901d2dd0ad 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -25,7 +25,7 @@ /obj/item/device/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = 1 icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + visible_message("The [src.name] burns out!") /obj/item/device/flash/proc/flash_recharge(var/mob/user) @@ -66,12 +66,16 @@ M.confused += power terrible_conversion_proc(M, user) M.Stun(1) - user.visible_message("[user] blinds [M] with the flash!") + visible_message("[user] blinds [M] with the flash!") + user << "You blind [M] with the flash!" + M << "[user] blinds you with the flash!" if(M.weakeyes) M.Stun(2) - M.visible_message("[M] gasps and shields their eyes!") + M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") else - user.visible_message("[user] fails to blind [M] with the flash!") + visible_message("[user] fails to blind [M] with the flash!") + user << "You fail to blind [M] with the flash!" + M << "[user] fails to blind you with the flash!" else if(M.flash_eyes()) M.confused += power @@ -88,16 +92,16 @@ add_logs(user, M, "flashed", object="[src.name]") flick("e_flash", M.flash) M.Weaken(rand(5,10)) - user.visible_message("[user] overloads [M]'s sensors with the flash!") + user.visible_message("[user] overloads [M]'s sensors with the flash!", "You overload [M]'s sensors with the flash!") return 1 - user.visible_message("[user] fails to blind [M] with the flash!") + user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!") /obj/item/device/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!try_use_flash(user)) return 0 - user.visible_message("[user]'s flash emits a blinding light!") + user.visible_message("[user]'s flash emits a blinding light!", "Your flash emits a blinding light!") for(var/mob/living/carbon/M in oviewers(3, null)) flash_carbon(M, user, 3, 0) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 14409f8c738..5e8555d13ad 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -38,7 +38,7 @@ /obj/item/device/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities. return 0 on = !on update_brightness(user) @@ -53,7 +53,7 @@ return ..() //just hit them in the head if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return var/mob/living/carbon/human/H = M //mob has protective eyewear @@ -64,21 +64,22 @@ if(M == user) //they're using it on themselves if(!M.eye_blind) flick("flash", M.flash) - M.visible_message("[M] directs [src] to \his eyes.", \ + M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes! Trippy!") else - M.visible_message("[M] directs [src] to \his eyes.", \ + M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes.") return - user.visible_message("[user] directs [src] to [M]'s eyes.", \ - "You direct [src] to [M]'s eyes.") + user.visible_message("[user] directs [src] to [M]'s eyes.", \ + "You direct [src] to [M]'s eyes.") + M << "[user] directs [src] to your eyes." if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected if(M.stat == DEAD || M.disabilities & BLIND) //mob is dead or fully blind - user << "[M] pupils does not react to the light!" + user << "[M] pupils don't react to the light!" else if(M.dna.check_mutation(XRAY)) //mob has X-RAY vision - user << "[M] pupils give an eerie glow!" + user << "[M] pupils give an eerie glow!" else //they're okay! if(!M.eye_blind) flick("flash", M.flash) //flash the affected mob @@ -111,7 +112,7 @@ /obj/item/device/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag) if(!proximity_flag) if(holo_cooldown) - user << "[src] is not ready yet." + user << "[src] is not ready yet!" return var/T = get_turf(target) if(locate(/mob/living) in T) @@ -237,7 +238,7 @@ obj/item/device/flashlight/lamp/bananalamp // Usual checks if(!fuel) - user << "It's out of fuel." + user << "It's out of fuel!" return if(on) return diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm new file mode 100644 index 00000000000..6ecc1a86125 --- /dev/null +++ b/code/game/objects/items/devices/instruments.dm @@ -0,0 +1,57 @@ +//copy pasta of the space piano, don't hurt me -Pete +/obj/item/device/instrument + name = "generic instrument" + var/datum/song/handheld/song + var/instrumentId = "generic" + var/instrumentExt = "ogg" + +/obj/item/device/instrument/New() + song = new(instrumentId, src) + song.instrumentExt = instrumentExt + +/obj/item/device/instrument/Destroy() + qdel(song) + song = null + ..() + +/obj/item/device/instrument/initialize() + song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded + ..() + +/obj/item/device/instrument/attack_self(mob/user as mob) + if(!user.IsAdvancedToolUser()) + user << "You don't have the dexterity to do this!" + return 1 + interact(user) + +/obj/item/device/instrument/interact(mob/user as mob) + if(!user) + return + + if(!isliving(user) || user.stat || user.restrained() || user.lying) + return + + user.set_machine(src) + song.interact(user) + +/obj/item/device/instrument/violin + name = "space violin" + desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\"" + icon = 'icons/obj/musician.dmi' + icon_state = "violin" + item_state = "violin" + force = 10 + hitsound = "swing_hit" + instrumentId = "violin" + +/obj/item/device/instrument/guitar + name = "guitar" + desc = "It's made of wood and has bronze strings." + icon = 'icons/obj/musician.dmi' + icon_state = "guitar" + item_state = "guitar" + force = 10 + attack_verb = list("played metal on", "serenaded", "crashed", "smashed") + hitsound = "swing_hit" + instrumentId = "guitar" + diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d773852de9b..c66a93aa4ad 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -112,7 +112,7 @@ if(C.weakeyes) C.Stun(1) else - outmsg = "You fail to blind [C] by shining [src] at their eyes." + outmsg = "You fail to blind [C] by shining [src] at their eyes!" //robots and AI else if(issilicon(target)) @@ -121,11 +121,11 @@ if(prob(effectchance * diode.rating)) flick("e_flash", S.flash) S.Weaken(rand(5,10)) - S << "Your sensors were overloaded by a laser!" + S << "Your sensors were overloaded by a laser!" outmsg = "You overload [S] by shining [src] at their sensors." add_logs(user, S, "shone in the sensors", object="laser pointer") else - outmsg = "You fail to overload [S] by shining [src] at their sensors." + outmsg = "You fail to overload [S] by shining [src] at their sensors!" //cameras else if(istype(target, /obj/machinery/camera)) @@ -135,7 +135,7 @@ outmsg = "You hit the lens of [C] with [src], temporarily disabling the camera!" add_logs(user, C, "EMPed", object="laser pointer") else - outmsg = "You missed the lens of [C] with [src]." + outmsg = "You miss the lens of [C] with [src]!" //laser pointer image icon_state = "pointer_[pointer_icon_state]" @@ -158,7 +158,7 @@ recharging = 1 SSobj.processing |= src if(energy <= 0) - user << "You've overused the battery of [src], now it needs time to recharge!" + user << "The [src]'s battery is overused, it needs time to recharge!" recharge_locked = 1 flick_overlay(I, showto, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index d4f37fa97e5..4580e823eba 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -82,19 +82,19 @@ user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." return else - user << "You need one sheet of glass to replace lights." + user << "You need one sheet of glass to replace lights!" if(istype(W, /obj/item/weapon/light)) var/obj/item/weapon/light/L = W if(L.status == 0) // LIGHT OKAY if(uses < max_uses) AddUses(1) - user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." + user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." user.drop_item() qdel(L) return else - user << "You need a working light." + user << "You need a working light!" return /obj/item/device/lightreplacer/emag_act() @@ -170,7 +170,7 @@ U << failmsg return else - U << "There is a working [target.fitting] already inserted." + U << "There is a working [target.fitting] already inserted!" return /obj/item/device/lightreplacer/proc/Emag() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 29c9fbfbba9..3b307fc00cf 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -32,7 +32,7 @@ message = capitalize(message) if(!user.can_speak(message)) - user << "You find yourself unable to speak at all." + user << "You find yourself unable to speak at all!" return if ((src.loc == user && user.stat == 0)) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 9d656406bbf..f827375582a 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -69,7 +69,7 @@ if(pai.master_dna) return if(!istype(usr, /mob/living/carbon)) - usr << "You don't have any DNA, or your DNA is incompatible with this device." + usr << "You don't have any DNA, or your DNA is incompatible with this device!" else var/mob/living/carbon/M = usr pai.master = M.real_name diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index b7256885428..cbf2bb7d193 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -67,7 +67,7 @@ user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) - src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") + src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") user << "You did it!" icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" @@ -81,13 +81,13 @@ return if(istype(I, /obj/item/weapon/wirecutters) && disarmed) if(!in_range(user, src)) - user << "You can't see the box well enough to cut the wires out." + user << "You can't see the box well enough to cut the wires out!" return - user.visible_message("[user] starts removing the payload and wires from \the [src].") + user.visible_message("[user] starts removing the payload and wires from \the [src].", "You start removing the payload and wires from \the [src]...") if(do_after(user, 40)) playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1) user.unEquip(src) - user.visible_message("[user] removes the insides of \the [src]!") + user.visible_message("[user] removes the insides of \the [src]!", "You remove the insides of \the [src].") var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc) C.amount = 3 new /obj/item/weapon/bombcore/miniature(src.loc) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 746dfaea182..970e7550699 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -61,21 +61,21 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - user << "No exposed cable here to attach to." + user << "No exposed cable here to attach to!" else set_mode(CLAMPED_OFF) user.visible_message( \ "[user] attaches \the [src] to the cable.", \ - "You attach \the [src] to the cable.", - "You hear some wires being connected to something.") + "You attach \the [src] to the cable.", + "You hear some wires being connected to something.") else - user << "Device must be placed over an exposed cable to attach to it." + user << "Device must be placed over an exposed cable to attach to it!" else set_mode(DISCONNECTED) user.visible_message( \ "[user] detaches \the [src] from the cable.", \ - "You detach \the [src] from the cable.", - "You hear some wires being disconnected from something.") + "You detach \the [src] from the cable.", + "You hear some wires being disconnected from something.") else ..() @@ -93,8 +93,8 @@ if(CLAMPED_OFF) user.visible_message( \ "[user] activates \the [src]!", \ - "You activate \the [src]!", - "You hear a click.") + "You activate \the [src].", + "You hear a click.") message_admins("Power sink activated by [key_name(user, user.client)](?) at ([x],[y],[z] - JMP)") log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") set_mode(OPERATING) @@ -102,8 +102,8 @@ if(OPERATING) user.visible_message( \ "[user] deactivates \the [src]!", \ - "You deactivate \the [src]!", - "You hear a click.") + "You deactivate \the [src].", + "You hear a click.") set_mode(CLAMPED_OFF) /obj/item/device/powersink/process() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 06922665771..3af3ab07841 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -27,7 +27,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.back) - user << "You need help taking this off!" + user << "You need help taking this off!" return ..() @@ -38,7 +38,7 @@ A.icon = 'icons/obj/assemblies.dmi' if(!user.unEquip(W)) - user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" + user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" return W.loc = A W.master = A diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 86fce610ab3..92ad5697dc7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -242,14 +242,14 @@ keyslot2 = null recalculateChannels() - user << "You pop out the encryption keys in the headset!" + user << "You pop out the encryption keys in the headset." else - user << "This headset doesn't have any unique encryption keys! How useless..." + user << "This headset doesn't have any unique encryption keys! How useless..." if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot && keyslot2) - user << "The headset can't hold another key!" + user << "The headset can't hold another key!" return if(!keyslot) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c7283a15f29..169baa3a259 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -372,7 +372,7 @@ signal.frequency = freqnum // Quick frequency set Broadcast_Message(M, voicemask, src, message, voice, jobname, real_name, - 4, signal.data["compression"], list(position.z, 0), freq, spans, + 5, signal.data["compression"], list(position.z, 0), freq, spans, verb_say, verb_ask, verb_exclaim, verb_yell) return @@ -621,14 +621,14 @@ keyslot = null recalculateChannels() - user << "You pop out the encryption key in the radio!" + user << "You pop out the encryption key in the radio." else - user << "This radio doesn't have any encryption keys!" + user << "This radio doesn't have any encryption keys!" if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) - user << "The radio can't hold another key!" + user << "The radio can't hold another key!" return if(!keyslot) diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index 226ae801ee0..ed4750d62fa 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -1,5 +1,4 @@ //gangtool device -//Allows gang leaders to recall the shuttle /obj/item/device/gangtool name = "suspicious device" desc = "A strange device of sorts. Hard to really make out what it actually does just by looking." @@ -13,6 +12,7 @@ var/gang //Which gang uses this? var/boss = 1 //If it has the power to promote gang members var/recalling = 0 + var/promotion_cost = 20 /obj/item/device/gangtool/New() //Initialize supply point income if it hasn't already been started if(!ticker.mode.gang_points) @@ -28,22 +28,29 @@ var/dat if(!gang) dat += "This device is not registered.
" - dat += "Register Device
" + if(user.mind in (ticker.mode.A_bosses | ticker.mode.B_bosses)) + dat += "Give this device to another member of your organization to use.
" + else + dat += "Register Device
" else var/gang_size = ((gang == "A")? (ticker.mode.A_gang.len + ticker.mode.A_bosses.len) : (ticker.mode.B_gang.len + ticker.mode.B_bosses.len)) var/gang_territory = ((gang == "A")? ticker.mode.A_territory.len : ticker.mode.B_territory.len) var/points = ((gang == "A") ? ticker.mode.gang_points.A : ticker.mode.gang_points.B) - dat += "Registered as [boss ? "Administrator." : "User."]
" - dat += "Organization: [(gang == "A")?("[gang_name("A")] Gang"):("[gang_name("B")] Gang")]
" + dat += "Registration: [(gang == "A")? gang_name("A") : gang_name("B")] Gang [boss ? "Administrator" : "Member"]
" dat += "Organization Size: [gang_size]
" - dat += "Areas Controlled: [gang_territory] ([round((gang_territory/start_state.num_territories)*100, 0.1)]% of station)
" + dat += "Station Control: [round((gang_territory/start_state.num_territories)*100, 1)]%
" dat += "Recall Emergency Shuttle
" dat += "
" dat += "Influence: [points]
" dat += "Time until Influence grows: [(points >= 100) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))]
" dat += "Purchase Items:
" + if(points >= 10) + dat += "(10 Influence) Territory Spraycan
" + else + dat += "(10 Influence) Territory Spraycan
" + if(points >= 25) dat += "(25 Influence) 10mm Pistol
" else @@ -55,9 +62,9 @@ dat += "(10 Influence) 10mm Ammo
" if(points >= 10) - dat += "(10 Influence) Territory Spraycan
" + dat += "(10 Influence) Switchblade
" else - dat += "(10 Influence) Territory Spraycan
" + dat += "(10 Influence) Switchblade
" if(points >= 50) dat += "(50 Influence) Recruitment Pen
" @@ -65,10 +72,12 @@ dat += "(50 Influence) Recruitment Pen
" if(boss) - if(points >= 40) - dat += "(40 Influence) Unregistered Gangtool
" + if(promotion_cost > 100) + dat += "(Maximum Reached) Promote a Gangster
" + else if(points >= promotion_cost) + dat += "([promotion_cost] Influence) Promote a Gangster
" else - dat += "(40 Influence) Unregistered Gangtool
" + dat += "([promotion_cost] Influence) Promote a Gangster
" dat += "
" dat += "Refresh
" @@ -87,6 +96,10 @@ var/points = ((gang == "A") ? ticker.mode.gang_points.A : ticker.mode.gang_points.B) var/item_type switch(href_list["purchase"]) + if("spraycan") + if(points >= 10) + item_type = /obj/item/toy/crayon/spraycan/gang + points = 10 if("pistol") if(points >= 25) item_type = /obj/item/weapon/gun/projectile/automatic/pistol @@ -95,18 +108,19 @@ if(points >= 10) item_type = /obj/item/ammo_box/magazine/m10mm points = 10 - if("spraycan") + if("switchblade") if(points >= 10) - item_type = /obj/item/toy/crayon/spraycan/gang + item_type = /obj/item/weapon/switchblade points = 10 if("pen") if(points >= 50) item_type = /obj/item/weapon/pen/gang points = 50 if("gangtool") - if(points >= 40) + if(points >= promotion_cost) item_type = /obj/item/device/gangtool/lt - points = 40 + points = promotion_cost + promotion_cost += 30 if(item_type) if(gang == "A") @@ -117,6 +131,7 @@ var/mob/living/carbon/human/H = usr H.put_in_any_hand_if_possible(purchased) ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "A [href_list["purchase"]] was purchased by [usr] for [points] Influence.") + log_game("A [href_list["purchase"]] was purchased by [key_name(usr)] for [points] Influence.") else if(href_list["choice"]) switch(href_list["choice"]) @@ -129,7 +144,7 @@ /obj/item/device/gangtool/proc/register_device(var/mob/user) var/promoted - if((user.mind in ticker.mode.A_gang) || (user.mind in ticker.mode.A_bosses)) + if(user.mind in (ticker.mode.A_gang | ticker.mode.A_bosses)) ticker.mode.A_tools += src gang = "A" if(!(user.mind in ticker.mode.A_bosses)) @@ -139,7 +154,7 @@ ticker.mode.update_gang_icons_added(user.mind, "A") log_game("[key_name(user)] has been promoted to Lieutenant in the [gang_name("A")] Gang (A)") promoted = 1 - else if((user.mind in ticker.mode.B_gang) || (user.mind in ticker.mode.B_bosses)) + else if(user.mind in (ticker.mode.B_gang | ticker.mode.B_bosses)) ticker.mode.B_tools += src gang = "B" if(!(user.mind in ticker.mode.B_bosses)) @@ -152,8 +167,8 @@ if(promoted) ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "[user] has been promoted to Lieutenant.") user << "You have been promoted to Lieutenant!" - user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station." - user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them." + user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station." + user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them." if(!gang) usr << "ACCESS DENIED: Unauthorized user." diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 693271398e2..2a8ef3cae0b 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -282,9 +282,9 @@ /obj/item/device/tape/attackby(obj/item/I, mob/user, params) if(ruined && istype(I, /obj/item/weapon/screwdriver)) - user << "You start winding the tape back in." + user << "You start winding the tape back in..." if(do_after(user, 120)) - user << "You wound the tape back in!" + user << "You wound the tape back in." fix() diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 85c5c9ceb4a..8437cf7c12e 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -16,7 +16,7 @@ /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) - user << "There are already two tanks attached, remove one first." + user << "There are already two tanks attached, remove one first!" return if(!tank_one) @@ -42,7 +42,7 @@ user << "The device is secured." return if(attached_device) - user << "There is already a device attached to the valve, remove it first." + user << "There is already a device attached to the valve, remove it first!" return user.remove_from_mob(item) attached_device = A diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index d72e28e591e..3807998cbc9 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -180,7 +180,7 @@ var/list/world_uplinks = list() qdel(S) user << "Teleporter refunded." else - user << "This teleporter is already used." + user << "This teleporter is already used!" // PRESET UPLINKS // A collection of preset uplinks. diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm deleted file mode 100644 index e8481778326..00000000000 --- a/code/game/objects/items/devices/violin.dm +++ /dev/null @@ -1,40 +0,0 @@ -//copy pasta of the space piano, don't hurt me -Pete - -/obj/item/device/violin - name = "space violin" - desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\"" - icon = 'icons/obj/musician.dmi' - icon_state = "violin" - item_state = "violin" - force = 10 - var/datum/song/handheld/song - hitsound = "swing_hit" - -/obj/item/device/violin/New() - song = new("violin", src) - song.instrumentExt = "ogg" - -/obj/item/device/violin/Destroy() - qdel(song) - song = null - ..() - -/obj/item/device/violin/initialize() - song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded - ..() - -/obj/item/device/violin/attack_self(mob/user as mob) - if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" - return 1 - interact(user) - -/obj/item/device/violin/interact(mob/user as mob) - if(!user) - return - - if(!isliving(user) || user.stat || user.restrained() || user.lying) - return - - user.set_machine(src) - song.interact(user) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index c517faaa381..bd10a107cad 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -113,8 +113,7 @@ P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) - usr << "You finish project the legnth of [icon_base] holotape." - user.visible_message("[user] finishes projecting the length of [icon_base] holotape.") + user.visible_message("[user] finishes projecting the length of [icon_base] holotape.", "You finish projecting the length of [icon_base] holotape.") charging = 1 spawn(40) @@ -138,7 +137,7 @@ if(!(W.dir == 5) || !(W.fulltile == 1)) return - user << "You start projecting the [icon_base] holotape onto [target]." + user << "You start projecting the [icon_base] holotape onto [target]..." if(!do_mob(user, target, 30)) return @@ -177,8 +176,8 @@ user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(loc, 'sound/weapons/Egloves.ogg', 80, 1) - user.visible_message("[user] hits [src].", \ - "You hit [src]." ) + user.visible_message("[user] hits [src].", \ + "You hit [src]." ) health -= rand(1,2) healthcheck() diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 4a56ab7b1f8..7e38de5879d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -21,7 +21,7 @@ for(var/mob/O in viewers(M, null)) if (O.client) O.show_message("[user] has prodded [M] with an electrically-charged arm!", 1, - " You hear someone fall", 2) + "You hear someone fall.", 2) add_logs(user, M, "stunned", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])") /obj/item/borg/overdrive diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 9641f540d89..2ea78ce58f9 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -92,13 +92,13 @@ if (M.use(1)) var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) - user << "You armed the robot frame." + user << "You arm the robot frame." if (user.get_inactive_hand()==src) user.unEquip(src) user.put_in_inactive_hand(B) qdel(src) else - user << "You need one sheet of metal to start building ED-209." + user << "You need one sheet of metal to start building ED-209!" return if(istype(W, /obj/item/robot_parts/l_leg)) if(src.l_leg) return @@ -136,9 +136,9 @@ src.chest = W src.updateicon() else if(!W:wires) - user << "You need to attach wires to it first!" + user << "You need to attach wires to it first!" else - user << "You need to attach a cell to it first!" + user << "You need to attach a cell to it first!" if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -148,22 +148,22 @@ src.head = W src.updateicon() else - user << "You need to attach a flash to it first!" + user << "You need to attach a flash to it first!" if (istype(W, /obj/item/device/multitool)) if(check_completion()) Interact(user) else - user << "The endoskeleton must be assembled before debugging can begin." + user << "The endoskeleton must be assembled before debugging can begin!" if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - user << "You can't put the MMI in, the frame has to be standing on the ground to be perfectly precise." + user << "You can't put the MMI in, the frame has to be standing on the ground to be perfectly precise!" return if(!M.brainmob) - user << "Sticking an empty MMI into the frame would sort of defeat the purpose." + user << "Sticking an empty MMI into the frame would sort of defeat the purpose!" return if(!M.brainmob.key) var/ghost_can_reenter = 0 @@ -173,19 +173,19 @@ ghost_can_reenter = 1 break if(!ghost_can_reenter) - user << "The mmi indicates that their mind is completely unresponsive; there's no point." + user << "The MMI indicates that their mind is completely unresponsive; there's no point!" return if(M.brainmob.stat == DEAD) - user << "Sticking a dead brain into the frame would sort of defeat the purpose." + user << "Sticking a dead brain into the frame would sort of defeat the purpose!" return if((M.brainmob.mind in ticker.mode.head_revolutionaries) || (M.brainmob.mind in ticker.mode.A_bosses) || (M.brainmob.mind in ticker.mode.B_bosses)) - user << "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the MMI." + user << "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the MMI!" return if(jobban_isbanned(M.brainmob, "Cyborg")) - user << "This MMI does not seem to fit." + user << "This MMI does not seem to fit!" return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc)) @@ -235,10 +235,10 @@ O << "Error: Servo motors unresponsive." else - user << "The MMI must go in after everything else!" + user << "The MMI must go in after everything else!" if(istype(W,/obj/item/weapon/pen)) - user << "You need to use a multitool to name [src]." + user << "You need to use a multitool to name [src]!" return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) @@ -260,7 +260,7 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_hand() if(!istype(item_in_hand, /obj/item/device/multitool)) - living_user << "You need a multitool!" + living_user << "You need a multitool!" return if(href_list["Name"]) @@ -294,23 +294,23 @@ ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) - user << "You have already inserted a cell!" + user << "You have already inserted a cell!" return else user.drop_item() W.loc = src src.cell = W - user << "You insert the cell!" + user << "You insert the cell." if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - user << "You have already inserted wire." + user << "You have already inserted wire!" return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) src.wires = 1.0 user << "You insert the wire." else - user << "You need one length of coil to wire it." + user << "You need one length of coil to wire it!" return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) @@ -318,10 +318,10 @@ if(istype(W, /obj/item/device/flash/handheld)) var/obj/item/device/flash/handheld/F = W if(src.flash1 && src.flash2) - user << "You have already inserted the eyes!" + user << "You have already inserted the eyes!" return else if(F.broken) - user << "You can't use a broken flash!" + user << "You can't use a broken flash!" return else user.drop_item() @@ -330,6 +330,6 @@ src.flash2 = F else src.flash1 = F - user << "You insert the flash into the eye socket!" + user << "You insert the flash into the eye socket." return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 01dc031a466..55c1be2ac5a 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -66,7 +66,7 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the cyborg before using this module!" + usr << "You have to repair the cyborg before using this module!" return 0 if(!R.key) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index ad9da7a8362..bffb0d948e7 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -37,7 +37,7 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) overlays.Cut() - usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." + usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." return @@ -59,10 +59,10 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(src) - user << "You take the target out of the stake." + user << "You take the target out of the stake." else src.loc = get_turf(user) - user << "You take the target out of the stake." + user << "You take the target out of the stake." stake.pinned_target = null return @@ -95,7 +95,7 @@ hp -= Proj.damage if(hp <= 0) - visible_message("[src] breaks into tiny pieces and collapses!") + visible_message("[src] breaks into tiny pieces and collapses!") qdel(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 0e90d30f526..47b6c6d4723 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -28,17 +28,17 @@ return 1 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 if(ishuman(M)) var/mob/living/carbon/human/H = M if(stop_bleeding) if(H.bleedsuppress) - user << "[H]'s bleeding is already bandaged." + user << "[H]'s bleeding is already bandaged!" return else if(!H.blood_max) - user << "[H] isn't bleeding." + user << "[H] isn't bleeding!" return if(isliving(M)) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index eb2bd629f67..7a2a2a5146a 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -38,15 +38,15 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "You need at least two rods to do this." + user << "You need at least two rods to do this!" return if(WT.remove_fuel(0,user)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) new_item.add_to_stacks(usr) - user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ - "You shaped [src] into metal with the weldingtool.", \ - "You hear welding.") + user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ + "You shape [src] into metal with the welding tool.", \ + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -58,9 +58,9 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) var/obj/item/weapon/reagent_containers/food/snacks/S = W if(amount != 1) - user << "You must use a single rod." + user << "You must use a single rod!" else if(S.w_class > 2) - user << "The ingredient is too big for [src]." + user << "The ingredient is too big for [src]!" else var/obj/item/weapon/reagent_containers/food/snacks/customizable/A = new/obj/item/weapon/reagent_containers/food/snacks/customizable/kebab(get_turf(src)) A.initialize_custom_food(src, S, user) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 775be481826..dcea59701ea 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -30,7 +30,7 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if (get_amount() < 1 || CC.get_amount() < 5) - user << "You need five lengths of coil and one sheet of glass to make wired glass!" return CC.use(5) use(1) @@ -51,7 +51,7 @@ if (!G && replace) user.put_in_hands(RG) else - user << "You need one rod and one sheet of glass to make reinforced glass." + user << "You need one rod and one sheet of glass to make reinforced glass!" return else return ..() @@ -60,7 +60,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 0 if(zero_amount()) return 0 var/title = "Sheet-Glass" @@ -75,7 +75,7 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + user << "There are too many windows in this location." return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) @@ -105,10 +105,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.get_amount() < 2) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + user << "There is a window in the way!" return 1 var/obj/structure/window/W W = new /obj/structure/window/fulltile( user.loc, 0 ) @@ -159,7 +159,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 0 var/title = "Sheet Reinf. Glass" title += " ([src.get_amount()] sheet\s left)" @@ -203,10 +203,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.get_amount() < 2) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + user << "There is a window in the way!" return 1 var/obj/structure/window/W W = new /obj/structure/window/reinforced/fulltile(user.loc, 1) @@ -221,16 +221,16 @@ for(var/obj/structure/windoor_assembly/WA in user.loc) if(WA.dir == user.dir) - user << "There is already a windoor assembly in that location." + user << "There is already a windoor assembly in that location!" return 1 for(var/obj/machinery/door/window/W in user.loc) if(W.dir == user.dir) - user << "There is already a windoor in that location." + user << "There is already a windoor in that location!" return 1 if(src.get_amount() < 5) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 var/obj/structure/windoor_assembly/WD = new(user.loc) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 4c4fa99a3e5..1795cb3a607 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -115,9 +115,9 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \ istype(W, /obj/item/weapon/hatchet) ) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) - usr.visible_message("\the [usr] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") + usr.visible_message("\the [usr] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") if(do_after(user,50)) - usr << "You cut the hair from this [src.singular_name]" + usr << "You cut the hair from this [src.singular_name]." //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 200718edd3e..1992e75ab6c 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -32,5 +32,5 @@ user << "You make a light tile." L.add_fingerprint(user) else - user << "You need one metal sheet to finish the light tile." + user << "You need one metal sheet to finish the light tile!" return diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b941b9228d7..f758904770d 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -122,7 +122,7 @@ if(!building_checks(R, multiplier)) return if (R.time) - usr << "Building [R.title] ..." + usr.visible_message("[usr] starts building [R.title].", "You start building [R.title]...") if (!do_after(usr, R.time)) return if(!building_checks(R, multiplier)) @@ -160,15 +160,15 @@ /obj/item/stack/proc/building_checks(datum/stack_recipe/R, multiplier) if (src.get_amount() < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - usr << "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" + usr << "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" else - usr << "You haven't got enough [src] to build \the [R.title]!" + usr << "You haven't got enough [src] to build \the [R.title]!" return 0 if (R.one_per_turf && (locate(R.result_type) in usr.loc)) - usr << "There is another [R.title] here!" + usr << "There is another [R.title] here!" return 0 if (R.on_floor && !istype(usr.loc, /turf/simulated/floor)) - usr << "\The [R.title] must be constructed on the floor!" + usr << "\The [R.title] must be constructed on the floor!" return 0 return 1 @@ -210,7 +210,7 @@ if (item.amount>=item.max_amount) continue oldsrc.attackby(item, usr) - usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." + usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index fd477f005ce..6d81c36bb2c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -22,18 +22,18 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 4) - user << "You need at least four tiles to do this." + user << "You need at least four tiles to do this!" return if(is_hot(WT) && !mineralType) - user << "You can not reform this." + user << "You can not reform this!" return if(WT.remove_fuel(0,user)) if(mineralType == "plasma") atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5) - user.visible_message("[user.name] set the plasma tiles on fire!", \ + user.visible_message("[user.name] sets the plasma tiles on fire!", \ "You set the plasma tiles on fire!") qdel(src) return @@ -41,9 +41,9 @@ if (mineralType == "metal") var/obj/item/stack/sheet/metal/new_item = new(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ "You shaped [src] into metal with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -55,9 +55,9 @@ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]") var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ "You shaped [src] into a sheet with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 68a4b1935dd..07fe7a7defc 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -54,10 +54,10 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(O.reagents) if(O.reagents.total_volume < 1) - user << "The [O] is empty." + user << "The [O] is empty." else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) - user << "The acid chews through the balloon!" + user << "The acid chews through the balloon!" O.reagents.reaction(user) qdel(src) else @@ -69,7 +69,7 @@ /obj/item/toy/balloon/throw_impact(atom/hit_atom) if(src.reagents.total_volume >= 1) - src.visible_message("\The [src] bursts!","You hear a pop and a splash.") + src.visible_message("\The [src] bursts!","You hear a pop and a splash.") src.reagents.reaction(get_turf(hit_atom)) for(var/atom/A in get_turf(hit_atom)) src.reagents.reaction(A) @@ -135,17 +135,17 @@ if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) - user << "It's already fully loaded!" + user << "It's already fully loaded!" return 1 if (A.amount_left <= 0) - user << "There are no more caps!" + user << "There are no more caps!" return 1 if (A.amount_left < (7 - src.bullets)) src.bullets += A.amount_left - user << text("You reload [] cap\s!", A.amount_left) + user << text("You reload [] cap\s.", A.amount_left) A.amount_left = 0 else - user << text("You reload [] cap\s!", 7 - src.bullets) + user << text("You reload [] cap\s.", 7 - src.bullets) A.amount_left -= 7 - src.bullets src.bullets = 7 A.update_icon() @@ -156,7 +156,7 @@ if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return src.add_fingerprint(user) if (src.bullets < 1) @@ -167,7 +167,7 @@ src.bullets-- user.visible_message("[user] fires [src] at [target]!", \ "You fire [src] at [target]!", \ - " You hear a gunshot.") + " You hear a gunshot!") /obj/item/toy/ammo/gun name = "capgun ammo" @@ -227,11 +227,11 @@ ..() if(istype(W, /obj/item/toy/sword)) if(W == src) - user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" + user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" if(ishuman(user)) user.adjustBrainLoss(10) else if((W.flags & NODROP) || (flags & NODROP)) - user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" + user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" else user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool." var/obj/item/weapon/twohanded/dualsaber/toy/newSaber = new /obj/item/weapon/twohanded/dualsaber/toy(user.loc) @@ -320,7 +320,7 @@ attack_verb = list("attacked", "coloured") var/colour = "#FF0000" //RGB var/drawtype = "rune" - var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow") + var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow","poseur tag") var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z") var/list/oriented = list("arrow","body") // These turn to face the same way as the drawer var/uses = 30 //0 for unlimited uses @@ -399,6 +399,11 @@ /obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) if(!proximity) return + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) + qdel(src) + return if(istype(target, /obj/effect/decal/cleanable)) target = target.loc if(is_type_in_list(target,validSurfaces)) @@ -412,23 +417,34 @@ var/area/territory var/gangID if(gang) - //Check area validity. Reject space, player-created areas, and non-station z-levels. - territory = get_area(target) - if (territory && (territory.z == ZLEVEL_STATION) && territory.valid_territory) - //Determine gang affiliation - if((user.mind in ticker.mode.A_bosses) || (user.mind in ticker.mode.A_gang)) - temp = "[gang_name("A")] gang tag" - gangID = "A" - else if((user.mind in ticker.mode.B_bosses) || (user.mind in ticker.mode.B_gang)) - temp = "[gang_name("B")] gang tag" - gangID = "B" + //Determine gang affiliation + if(user.mind in (ticker.mode.A_bosses | ticker.mode.A_gang)) + temp = "[gang_name("A")] gang tag" + gangID = "A" + else if(user.mind in (ticker.mode.B_bosses | ticker.mode.B_gang)) + temp = "[gang_name("B")] gang tag" + gangID = "B" - //Check if this area is already tagged by a gang - if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag - if(territory_claimed(territory, user)) + //Check area validity. Reject space, player-created areas, and non-station z-levels. + if (gangID) + var/area/user_area = get_area(user.loc) + territory = get_area(target) + if(territory && (territory.z == ZLEVEL_STATION) && territory.valid_territory) + //Check if this area is already tagged by a gang + if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag + if(territory_claimed(territory, user)) + return + //Prevent people spraying from outside of the territory (ie. Maint walls) + if(istype(user_area) && (user_area.type == territory.type)) + if(locate(/obj/machinery/power/apc) in (user.loc.contents | target.contents)) + user << "You cannot tag here." + return + else + user << "You cannot tag [territory] from the outside." return - else - user << "This area is unsuitable for territory tagging." + else + user << "[territory] is unsuitable for tagging." + return ///////////////////////////////////////// var/graf_rot @@ -443,7 +459,7 @@ else graf_rot = 0 - user << "You start [instant ? "spraying" : "drawing"] a [temp] on the [target.name]." + user << "You start [instant ? "spraying" : "drawing"] a [temp] on the [target.name]..." if(instant) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) if((instant>0) || do_after(user, 50)) @@ -457,17 +473,18 @@ for(var/obj/effect/decal/cleanable/crayon/old_marking in target) qdel(old_marking) new /obj/effect/decal/cleanable/crayon/gang(target,gangID,temp,graf_rot) + user << "You tagged [territory] for your gang!" else new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp,graf_rot) - user << "You finish [instant ? "spraying" : "drawing"] [temp]." + user << "You finish [instant ? "spraying" : "drawing"] [temp]." if(instant<0) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - if(uses) - uses-- - if(!uses) - user << "You used up your [src.name]!" + uses = max(0,uses-1) + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) qdel(src) return @@ -475,19 +492,18 @@ if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" user.nutrition += 5 - if(uses) - uses -= 5 - if(uses <= 0) - user << "There is no more of [src.name] left!" - qdel(src) + uses = max(0,uses-5) + if(!uses) + user << "There is no more of [src.name] left!" + qdel(src) else ..() /obj/item/toy/crayon/proc/territory_claimed(var/area/territory,mob/user) var/occupying_gang - if(territory.type in ticker.mode.A_territory) + if(territory.type in (ticker.mode.A_territory | ticker.mode.A_territory_new)) occupying_gang = gang_name("A") - if(territory.type in ticker.mode.B_territory) + if(territory.type in (ticker.mode.B_territory | ticker.mode.B_territory_new)) occupying_gang = gang_name("B") if(occupying_gang) user << "[territory] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!" @@ -511,7 +527,7 @@ s.set_up(3, 1, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message(" The [src.name] explodes!"," You hear a snap!") + src.visible_message(" The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -525,7 +541,7 @@ s.set_up(2, 0, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("The [src.name] explodes!","You hear a snap!") + src.visible_message("The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -744,7 +760,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) var/choice = null if(cards.len == 0) src.icon_state = "deck_[deckstyle]_empty" - user << "There are no more cards to draw." + user << "There are no more cards to draw!" return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) choice = cards[1] @@ -755,7 +771,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) src.cards -= choice H.pickup(user) user.put_in_active_hand(H) - user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.") + user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.") if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -767,7 +783,7 @@ obj/item/toy/cards/deck/attack_self(mob/user as mob) if(cooldown < world.time - 50) cards = shuffle(cards) playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) - user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") + user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") cooldown = world.time obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) @@ -775,13 +791,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The card is stuck to your hand, you can't add it to the deck!" + user << "The card is stuck to your hand, you can't add it to the deck!" return src.cards += C.cardname - user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") + user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -795,13 +811,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The hand of cards is stuck to your hand, you can't add it to the deck!" + user << "The hand of cards is stuck to your hand, you can't add it to the deck!" return src.cards += C.currenthand - user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") + user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -826,7 +842,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, M.put_in_r_hand(src) usr << "You pick up the deck." else - usr << "You can't reach it from here." + usr << "You can't reach it from here!" @@ -899,7 +915,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living if(C.parentdeck == src.parentdeck) src.currenthand += C.cardname user.unEquip(C) - user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.") + user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.") interact(user) if(currenthand.len > 4) src.icon_state = "[deckstyle]_hand5" @@ -909,7 +925,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living src.icon_state = "[deckstyle]_hand3" qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) ..() @@ -938,9 +954,9 @@ obj/item/toy/cards/singlecard/examine(mob/user) if(ishuman(user)) var/mob/living/carbon/human/cardUser = user if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src) - cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") + cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") else - cardUser << "You need to have the card in your hand to check it." + cardUser << "You need to have the card in your hand to check it!" obj/item/toy/cards/singlecard/verb/Flip() @@ -980,14 +996,14 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) qdel(C) qdel(src) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(istype(I, /obj/item/toy/cards/cardhand/)) var/obj/item/toy/cards/cardhand/H = I if(H.parentdeck == parentdeck) H.currenthand += cardname user.unEquip(src) - user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.") + user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.") H.interact(user) if(H.currenthand.len > 4) H.icon_state = "[deckstyle]_hand5" @@ -997,7 +1013,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) H.icon_state = "[deckstyle]_hand3" qdel(src) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" obj/item/toy/cards/singlecard/attack_self(mob/user) @@ -1053,7 +1069,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/nuke/attack_self(mob/user) if (cooldown < world.time) cooldown = world.time + 1800 //3 minutes - user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") + user.visible_message("[user] presses a button on [src].", "You activate [src], it plays a loud noise!", "You hear the click of a button.") spawn(5) //gia said so icon_state = "nuketoy" playsound(src, 'sound/machines/Alarm.ogg', 100, 0, surround = 0) @@ -1071,7 +1087,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/minimeteor name = "\improper Mini-Meteor" - desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™" + desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor?" icon = 'icons/obj/toy.dmi' icon_state = "minimeteor" w_class = 2.0 @@ -1112,7 +1128,7 @@ obj/item/toy/cards/deck/syndicate */ /obj/item/toy/redbutton name = "big red button" - desc = "A big, plastic red button. Reads 'From HonkCo Pranks©' on the back." + desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back." icon = 'icons/obj/assemblies.dmi' icon_state = "bigred" w_class = 2.0 @@ -1121,7 +1137,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/redbutton/attack_self(mob/user) if (cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds - user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") + user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0) for(var/mob/M in range(10, src)) // Checks range if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI @@ -1129,4 +1145,4 @@ obj/item/toy/cards/deck/syndicate shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. else - user << "Nothing happens." \ No newline at end of file + user << "Nothing happens." diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 57f667ac382..deef2e3e927 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -59,7 +59,7 @@ AI MODULES //The proc that actually changes the silicon's laws. /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) - target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " + target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " /******************** Modules ********************/ diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index e76181e672a..b04cbfa5467 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -110,7 +110,7 @@ RCD if(istype(W, /obj/item/weapon/rcd_ammo)) var/obj/item/weapon/rcd_ammo/R = W if((matter + R.ammoamt) > max_matter) - user << "The RCD cant hold any more matter-units." + user << "The RCD can't hold any more matter-units!" return user.drop_item() qdel(W) @@ -127,19 +127,19 @@ RCD switch(mode) if(1) mode = 2 - user << "Changed mode to 'Airlock'" + user << "You change RCD's mode to 'Airlock'." if(prob(20)) src.spark_system.start() return if(2) mode = 3 - user << "Changed mode to 'Deconstruct'" + user << "You change RCD's mode to 'Deconstruct'." if(prob(20)) src.spark_system.start() return if(3) mode = 1 - user << "Changed mode to 'Floor & Walls'" + user << "You change RCD's mode to 'Floor & Walls'." if(prob(20)) src.spark_system.start() return @@ -161,7 +161,7 @@ RCD if(1) if(istype(A, /turf/space)) if(useResource(1, user)) - user << "Building Floor..." + user << "You start building floor..." activate() A:ChangeTurf(/turf/simulated/floor/plating) return 1 @@ -169,7 +169,7 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(3, user)) - user << "Building Wall ..." + user << "You start building wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) if(!useResource(3, user)) return 0 @@ -188,7 +188,7 @@ RCD break if(door_check) - user << "Building Airlock..." + user << "You start building airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(10, user)) return 0 @@ -202,7 +202,7 @@ RCD return 1 return 0 else - user << "There is another door here!" + user << "There is another door here!" return 0 return 0 @@ -211,7 +211,7 @@ RCD if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) return 0 if(checkResource(5, user)) - user << "Deconstructing Wall..." + user << "You start deconstructing wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40)) if(!useResource(5, user)) return 0 @@ -222,7 +222,7 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(5, user)) - user << "Deconstructing Floor..." + user << "You start deconstructing floor..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(5, user)) return 0 @@ -233,7 +233,7 @@ RCD if(istype(A, /obj/machinery/door/airlock)) if(checkResource(20, user)) - user << "Deconstructing Airlock..." + user << "You start deconstructing airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(20, user)) return 0 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 64185d5d5a0..360e473ab26 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -17,8 +17,12 @@ RPD #define METER_MODE 1 #define DISPOSALS_MODE 2 +#define CATEGORY_ATMOS 0 +#define CATEGORY_DISPOSALS 1 + /datum/pipe_info var/id=-1 + var/categoryId = CATEGORY_ATMOS var/dir=SOUTH var/dirtype=PIPE_BINARY var/icon = 'icons/obj/pipe-item.dmi' @@ -59,6 +63,7 @@ var/global/list/disposalpipeID2State=list( ) /datum/pipe_info/disposal + categoryId = CATEGORY_DISPOSALS icon = 'icons/obj/pipes/disposal.dmi' icon_state = "meterX" @@ -152,6 +157,7 @@ var/global/list/RPD_recipes=list( "purple" = rgb(130,43,255) ) var/paint_color="grey" + var/screen = CATEGORY_ATMOS //Starts on the atmos tab. /obj/item/weapon/pipe_dispenser/New() . = ..() @@ -163,34 +169,57 @@ var/global/list/RPD_recipes=list( show_menu(user) /obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title,var/flipped=0) - var/selected="" + var/selected=" class=\"imglink\"" if(_dir == p_dir) - selected=" class=\"selected\"" - return "
Type
Utilities: --
-
- Eat Pipes -
- Paint Pipes -
- "}
+ if(p_class != EATING_MODE)
+ dat += "
- Eat Pipes " + else + dat += "
- Eat Pipes " + if(p_class != PAINT_MODE) + dat += "
- Paint Pipes " + else + dat += "
- Paint Pipes " + dat += "
- "
+ if(screen == CATEGORY_ATMOS)
+ dat += "Atmospherics Disposals
" + else if(screen == CATEGORY_DISPOSALS) + dat += "Atmospherics Disposals
" + dat += "
- "
var/list/cat=RPD_recipes[category]
for(var/label in cat)
var/datum/pipe_info/I = cat[label]
var/found=0
if(I.id == p_type)
- if(p_class==ATMOS_MODE && I.type==/datum/pipe_info)
+ if((p_class == ATMOS_MODE || p_class == METER_MODE) && (I.type == /datum/pipe_info || I.type == /datum/pipe_info/meter))
found=1
- else if(p_class==DISPOSALS_MODE && I.type==/datum/pipe_info/disposal)
+ else if(p_class == DISPOSALS_MODE && I.type==/datum/pipe_info/disposal)
found=1
if(found)
preview=new /icon(I.icon,I.icon_state)
- dat += I.Render(src,label)
+ if(screen == I.categoryId)
+ if(I.id == p_type)
+ datbuild += "[label]"
+ else
+ datbuild += I.Render(src,label)
+
+ if(length(datbuild) > 0)
+ dat += "[category]:
- Ports Nienhaus's guitar, generalizes handheld instrument code. +
- Fixes being unable to build disposal pipes on walls, makes changing the RPD's settings not affect pipes that are currently building, makes the RPD use the datum/browser ui, makes it use categories and makes it show the selected mode. +
- Nanotrasen has provided designs for fabrication of APC power control modules. You may print them at any autolathe. +
- Gangs can now purchase switchblades, a relatively cheap and decently robust melee weapon. +
- Gangs now require at least 66% control of the station to win. +
- Gang spraycan uses reduced to 15. +
- Pistol cost increased to 30 Influence +
- Promotions now start off cheap at 20 influence but get more expensive the more people you promote. +
- Added a Create Antagonist button for revenants. +
- Removed Mind Blast. +
- Revenants no longer get killed by explosions. +
- Mind spike cooldown increased to 4 seconds. +
- Harvest now takes 8 seconds and requires you to be adjacent to the target. +
- Hypnotise sleeps targets for longer. +
- Revenant now starts with 3 strikes. +
- Telecom machines are now deconstructed the same way as all other constructable machines. +
- You can no longer overdose on nicotine but you can get addicted (very mild effects). +
- "
+ dat += datbuild
+ datbuild = ""
dat += "
Direction
[color_picker]" + dirsel = "Color
[color_picker]" + else + dirsel = "" if(PIPE_BINARY) // Straight, N-S, W-E if(preview) @@ -359,47 +390,52 @@ var/global/list/RPD_recipes=list( "} - dat = {" - - -" diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 15405604004..e1d8952d518 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -30,7 +30,7 @@ W.loc = loc W.layer = 3.1 pinned_target = W - user << "You slide the target into the stake." + user << "You slide the target into the stake." return /obj/structure/target_stake/attack_hand(mob/user as mob) @@ -44,9 +44,9 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(pinned_target) - user << "You take the target out of the stake." + user << "You take the target out of the stake." else pinned_target.loc = get_turf(user) - user << "You take the target out of the stake." + user << "You take the target out of the stake." pinned_target = null diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 949f192ecc7..cbc1fbb529a 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -54,7 +54,7 @@ T.add_fingerprint(user) T.loc = src.loc T.dir = turn(src.dir, -90) - user.visible_message("[user] inserts the [R].", "You insert the [R].") + user.visible_message("[user] inserts the [R].", "You insert the [R].") qdel(R) @@ -67,7 +67,7 @@ else if(icon_state == "open") if(pod.contents.len && user.loc != pod) - user.visible_message("[user] starts emptying [pod]'s contents onto the floor!") + user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", "You start emptying [pod]'s contents onto the floor...") if(do_after(user, 10)) //So it doesn't default to close_animation() on fail if(pod.loc == loc) for(var/atom/movable/AM in pod) @@ -96,9 +96,9 @@ if(istype(W, /obj/item/weapon/crowbar)) for(var/obj/structure/transit_tube_pod/pod in loc) if(pod.contents) - user << "Empty the pod first." + user << "Empty the pod first!" return - user.visible_message("[user] removes the [pod].", "You remove the [pod].") + user.visible_message("[user] removes the [pod].", "You remove the [pod].") var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(src.loc) pod.transfer_fingerprints_to(R) R.add_fingerprint(user) diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index bdee679770d..3db04c5088a 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -42,12 +42,12 @@ obj/structure/transit_tube/ex_act(severity, target) if(istype(W, /obj/item/weapon/wrench)) if(copytext(icon_state, 1, 3) != "D-") //decorative diagonals cannot be unwrenched directly for(var/obj/structure/transit_tube_pod/pod in src.loc) - user << "Remove the pod first." + user << "Remove the pod first!" return - user.visible_message("[user] starts to deattach \the [src]!", "You start deattaching the [name]...") + user.visible_message("[user] starts to deattach \the [src].", "You start to deattach the [name]...") playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 35)) - user << "You deattach the [name]!" + user << "You deattach the [name]." var/obj/structure/R = new tube_construction(src.loc) R.icon_state = src.icon_state src.transfer_fingerprints_to(R) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index aa13ac145fc..cb47c7c4e15 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -83,7 +83,7 @@ src.add_fingerprint(user) if(do_after(user, 40)) if(!src) return - user << "You attach the [name]!" + user << "You attach the [name]." var/obj/structure/transit_tube/R = src.buildtube() src.transfer_fingerprints_to(R) qdel(src) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 645a121e168..b686464321e 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -31,7 +31,7 @@ for(var/obj/structure/transit_tube/station/T in loc) return if(src.contents.len) - user.visible_message("[user] empties \the [src].", "You empty \the [src].") + user.visible_message("[user] empties \the [src].", "You empty \the [src].") src.empty() return else @@ -46,7 +46,7 @@ if(!moving) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user << "You start trying to escape from the pod." + user << "You start trying to escape from the pod..." if(do_after(user, 600)) user << "You manage to open the pod." src.empty() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2971a867071..69e34eab25a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -20,7 +20,7 @@ if(swirlie) user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, "swing_hit", 25, 1) - swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.") + swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.") swirlie.adjustBruteLoss(5) return @@ -48,10 +48,10 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/crowbar)) - user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]." + user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]..." playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) - user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") + user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") cistern = !cistern update_icon() return @@ -65,14 +65,14 @@ var/mob/living/GM = G.affecting if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - user << "[GM] needs to be on [src]." + user << "[GM] needs to be on [src]!" return if(!swirlie) if(open) - GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie!") + GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie...") swirlie = GM if(do_after(user, 30, 5, 0)) - GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.") + GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.") if(iscarbon(GM)) var/mob/living/carbon/C = GM if(!C.internal) @@ -85,17 +85,17 @@ GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!") GM.adjustBruteLoss(5) else - user << "You need a tighter grip." + user << "You need a tighter grip!" if(cistern) if(I.w_class > 3) - user << "[I] does not fit." + user << "[I] does not fit!" return if(w_items + I.w_class > 5) - user << "The cistern is full." + user << "The cistern is full!" return if(!user.drop_item()) - user << "\The [I] is stuck to your hand, you cannot put it in the cistern!" + user << "\The [I] is stuck to your hand, you cannot put it in the cistern!" return I.loc = src w_items += I.w_class @@ -127,7 +127,7 @@ user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!") GM.adjustBruteLoss(8) else - user << "You need a tighter grip." + user << "You need a tighter grip!" /obj/machinery/shower @@ -171,7 +171,7 @@ if(I.type == /obj/item/device/analyzer) user << "The water temperature seems to be [watertemp]." if(istype(I, /obj/item/weapon/wrench)) - user << "You begin to adjust the temperature valve with \the [I]." + user << "You begin to adjust the temperature valve with \the [I]..." if(do_after(user, 50)) switch(watertemp) if("normal") @@ -236,7 +236,7 @@ var/mob/living/L = O L.ExtinguishMob() L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily - L << "You've been drenched in water!" + L << "You're drenched in water!" if(iscarbon(O)) var/mob/living/carbon/M = O if(M.r_hand) @@ -363,7 +363,7 @@ user << "Someone's already washing here." return - user << "You start washing your hands." + user << "You start washing your hands..." busy = 1 sleep(40) @@ -372,12 +372,12 @@ if(!Adjacent(user)) return //Person has moved away from the sink user.clean_blood() - user.visible_message("[user] washes their hands in [src].") + user.visible_message("[user] washes their hands in [src].", "You wash your hands in [src].") /obj/structure/sink/attackby(obj/item/O, mob/user, params) if(busy) - user << "Someone's already washing here." + user << "Someone's already washing here!" return if(istype(O, /obj/item/weapon/reagent_containers)) @@ -410,7 +410,7 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - usr << "You start washing [I]." + usr << "You start washing [I]..." busy = 1 sleep(40) @@ -422,7 +422,7 @@ O.clean_blood() user.visible_message( \ - "[user] washes [I] using [src].", \ + "[user] washes [I] using [src].", \ "You wash [I] using [src].") diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 9ba3ec15458..1c173316ec3 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -76,12 +76,12 @@ obj/structure/windoor_assembly/Destroy() if(istype(W, /obj/item/weapon/weldingtool) && !anchored ) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) - user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.") + user.visible_message("[user] disassembles the windoor assembly.", "You start to disassemble the windoor assembly...") playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) if(do_after(user, 40)) if(!src || !WT.isOn()) return - user << "You dissasembled the windoor assembly!" + user << "You disassemble the windoor assembly." var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5) RG.add_fingerprint(user) if(secure) @@ -95,19 +95,19 @@ obj/structure/windoor_assembly/Destroy() if(istype(W, /obj/item/weapon/wrench) && !anchored) for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + user << "There is already a windoor in that location!" return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") + user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor...") if(do_after(user, 40)) if(!src || src.anchored) return for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + user << "There is already a windoor in that location!" return - user << "You've secured the windoor assembly!" + user << "You secure the windoor assembly." src.anchored = 1 if(src.secure) src.name = "secure anchored windoor assembly" @@ -117,12 +117,12 @@ obj/structure/windoor_assembly/Destroy() //Unwrenching an unsecure assembly un-anchors it. Step 4 undone else if(istype(W, /obj/item/weapon/wrench) && anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor.") + user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor...") if(do_after(user, 40)) if(!src || !src.anchored) return - user << "You've unsecured the windoor assembly!" + user << "You unsecure the windoor assembly." src.anchored = 0 if(src.secure) src.name = "secure windoor assembly" @@ -133,9 +133,9 @@ obj/structure/windoor_assembly/Destroy() else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure) var/obj/item/stack/sheet/plasteel/P = W if(P.amount < 2) - user << "You need more plasteel to do this." + user << "You need more plasteel to do this!" return - user << "You start to reinforce the windoor with plasteel." + user << "You start to reinforce the windoor with plasteel..." if(do_after(user,40)) if(!src || secure) @@ -151,14 +151,14 @@ obj/structure/windoor_assembly/Destroy() //Adding cable to the assembly. Step 5 complete. else if(istype(W, /obj/item/stack/cable_coil) && anchored) - user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly.") + user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly...") if(do_after(user, 40)) if(!src || !src.anchored || src.state != "01") return var/obj/item/stack/cable_coil/CC = W CC.use(1) - user << "You wire the windoor!" + user << "You wire the windoor." src.state = "02" if(src.secure) src.name = "secure wired windoor assembly" @@ -172,13 +172,13 @@ obj/structure/windoor_assembly/Destroy() //Removing wire from the assembly. Step 5 undone. if(istype(W, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") + user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...") if(do_after(user, 40)) if(!src || src.state != "02") return - user << "You cut the windoor wires!" + user << "You cut the windoor wires." new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) @@ -189,7 +189,7 @@ obj/structure/windoor_assembly/Destroy() //Adding airlock electronics for access. Step 6 complete. else if(istype(W, /obj/item/weapon/airlock_electronics)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") + user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...") user.drop_item() W.loc = src @@ -197,7 +197,7 @@ obj/structure/windoor_assembly/Destroy() if(!src || src.electronics) W.loc = src.loc return - user << "You've installed the airlock electronics!" + user << "You install the airlock electronics." src.name = "near finished windoor assembly" src.electronics = W else @@ -209,12 +209,12 @@ obj/structure/windoor_assembly/Destroy() return playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly...") if(do_after(user, 40)) if(!src || !electronics) return - user << "You've removed the airlock electronics!" + user << "You remove the airlock electronics." src.name = "wired windoor assembly" var/obj/item/weapon/airlock_electronics/ae ae = electronics @@ -235,18 +235,18 @@ obj/structure/windoor_assembly/Destroy() //Crowbar to complete the assembly, Step 7 complete. else if(istype(W, /obj/item/weapon/crowbar)) if(!src.electronics) - usr << "The assembly is missing electronics." + usr << "The assembly is missing electronics!" return usr << browse(null, "window=windoor_access") playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.") + user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame...") if(do_after(user, 40)) if(src.loc && src.electronics) density = 1 //Shouldn't matter but just incase - user << "You finish the windoor!" + user << "You finish the windoor." if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc) @@ -306,7 +306,7 @@ obj/structure/windoor_assembly/Destroy() if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor; therefore, you can't rotate it!" + usr << "It is fastened to the floor; therefore, you can't rotate it!" return 0 //if(src.state != "01") //update_nearby_tiles(need_rebuild=1) //Compel updates before @@ -329,11 +329,11 @@ obj/structure/windoor_assembly/Destroy() return if(src.facing == "l") - usr << "The windoor will now slide to the right." + usr << "The windoor will now slide to the right." src.facing = "r" else src.facing = "l" - usr << "The windoor will now slide to the left." + usr << "The windoor will now slide to the left." update_icon() return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0d0ccf7702e..f773adc6714 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -136,7 +136,7 @@ if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] knocks on [src].") + user.visible_message("[user] knocks on [src].") add_fingerprint(user) playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1) @@ -191,51 +191,51 @@ if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) if(reinf && (state == 2 || state == 1)) - user << (state == 2 ? "You begin to unscrew the window from the frame." : "You begin to screw the window to the frame.") + user << (state == 2 ? "You begin to unscrew the window from the frame..." : "You begin to screw the window to the frame...") else if(reinf && state == 0) - user << (anchored ? "You begin to unscrew the frame from the floor." : "You begin to screw the frame to the floor.") + user << (anchored ? "You begin to unscrew the frame from the floor..." : "You begin to screw the frame to the floor...") else if(!reinf) - user << (anchored ? "You begin to unscrew the window from the floor." : "You begin to screw the window to the floor.") + user << (anchored ? "You begin to unscrew the window from the floor..." : "You begin to screw the window to the floor...") if(do_after(user, 40)) if(reinf && (state == 1 || state == 2)) //If state was unfastened, fasten it, else do the reverse state = (state == 1 ? 2 : 1) - user << (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.") + user << (state == 1 ? "You unfasten the window from the frame." : "You fasten the window to the frame.") else if(reinf && state == 0) anchored = !anchored update_nearby_icons() - user << (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.") + user << (anchored ? "You fasten the frame to the floor." : "You unfasten the frame from the floor.") else if(!reinf) anchored = !anchored update_nearby_icons() - user << (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") + user << (anchored ? "You fasten the window to the floor." : "You unfasten the window.") else if (istype(I, /obj/item/weapon/crowbar) && reinf && (state == 0 || state == 1)) - user << (state == 0 ? "You begin to lever the window into the frame." : "You begin to lever the window out of the frame.") + user << (state == 0 ? "You begin to lever the window into the frame..." : "You begin to lever the window out of the frame...") playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) if(do_after(user, 40)) //If state was out of frame, put into frame, else do the reverse state = (state == 0 ? 1 : 0) - user << (state == 1 ? "You have pried the window into the frame." : "You have pried the window out of the frame.") + user << (state == 1 ? "You pry the window into the frame." : "You pry the window out of the frame.") else if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = I if(user.a_intent == "help") //so you can still break windows with welding tools if(health < maxhealth) if(WT.remove_fuel(0,user)) - user << "You begin repairing [src]." + user << "You begin repairing [src]..." playsound(loc, 'sound/items/Welder.ogg', 40, 1) if(do_after(user, 40)) health = maxhealth playsound(loc, 'sound/items/Welder2.ogg', 50, 1) else - user << "[src] is already in good condition." + user << "[src] is already in good condition!" update_nearby_icons() else if(istype(I, /obj/item/weapon/wrench) && !anchored) playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) - user << " You begin to disassemble [src]." + user << " You begin to disassemble [src]..." if(do_after(user, 40)) if(disassembled) return //Prevents multiple deconstruction attempts @@ -311,7 +311,7 @@ return if(anchored) - usr << "It is fastened to the floor therefore you can't rotate it!" + usr << "It is fastened to the floor therefore you can't rotate it!" return 0 dir = turn(dir, 90) @@ -331,7 +331,7 @@ return if(anchored) - usr << "It is fastened to the floor therefore you can't rotate it!" + usr << "It is fastened to the floor therefore you can't rotate it!" return 0 dir = turn(dir, 270) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index b41e048e30c..d09fd62b222 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -30,20 +30,20 @@ return if(istype(C, /obj/item/stack/rods)) if(broken || burnt) - user << "Repair the plating first." + user << "Repair the plating first!" return var/obj/item/stack/rods/R = C if (R.get_amount() < 2) - user << "You need two rods to make a reinforced floor." + user << "You need two rods to make a reinforced floor!" return else - user << "Reinforcing the floor..." + user << "You begin reinforcing the floor..." if(do_after(user, 30)) if (R.get_amount() >= 2) ChangeTurf(/turf/simulated/floor/engine) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) R.use(2) - user << "You have reinforced the floor." + user << "You reinforce the floor." return else if(istype(C, /obj/item/stack/tile)) if(!broken && !burnt) @@ -56,7 +56,7 @@ W.use(1) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) else - user << "This section is too damaged to support a tile. Use a welder to fix the damage." + user << "This section is too damaged to support a tile! Use a welder to fix the damage." else if(istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder = C if( welder.isOn() && (broken || burnt) ) @@ -95,7 +95,7 @@ if(!C || !user) return if(istype(C, /obj/item/weapon/wrench)) - user << "Removing rods..." + user << "You begin removing rods..." playsound(src, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30)) new /obj/item/stack/rods(src, 2) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 06843b8b32d..62f5324dc59 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -181,7 +181,7 @@ if( istype(W, /obj/item/weapon/weldingtool) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) - user << "You begin slicing through the outer plating." + user << "You begin slicing through the outer plating..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, slicing_duration)) if( !istype(src, /turf/simulated/wall) || !user || !WT || !WT.isOn() || !T ) @@ -191,7 +191,7 @@ dismantle_wall() return 1 else if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) ) - user << "You begin slicing through the outer plating." + user << "You begin slicing through the outer plating..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, slicing_duration*0.6)) // plasma cutter is faster than welding tool if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) @@ -199,7 +199,7 @@ if( user.loc == T && user.get_active_hand() == W ) user << "You remove the outer plating." dismantle_wall() - visible_message("The wall was sliced apart by [user]!", "You hear metal being sliced apart.") + visible_message("The wall was sliced apart by [user]!", "You hear metal being sliced apart.") return 1 return 0 @@ -208,7 +208,7 @@ if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) var/obj/item/weapon/pickaxe/drill/jackhammer/D = W if(!D.bcell.use(400)) - user << "Your [D.name] doesn't have enough power to break through the [name]." + user << "Your [D.name] doesn't have enough power to break through the [name]!" return D.update_icon() if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) @@ -216,7 +216,7 @@ if( user.loc == T && user.get_active_hand() == W ) D.playDigSound() dismantle_wall() - visible_message("[user] smashes through the [name] with the [W.name]!", "You hear the grinding of metal.") + visible_message("[user] smashes through the [name] with the [W.name]!", "You hear the grinding of metal.") return 1 return 0 diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index cf7b6ffd6ec..be6281e25fe 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -34,22 +34,22 @@ if(!D.bcell.use(800)) user << "Your [D.name] doesn't have enough power to break through the [name]." return 1 - user << "You begin to smash though the [name]." + user << "You begin to smash though the [name]..." if(do_after(user, 50)) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return 1 if( user.loc == T && user.get_active_hand() == W ) D.update_icon() D.playDigSound() - visible_message("[user] smashes through the [name] with the [D.name]!", "You hear the grinding of metal.") + visible_message("[user] smashes through the [name] with the [D.name]!", "You hear the grinding of metal.") dismantle_wall() return 1 else if(istype(W, /obj/item/stack/sheet/metal) && d_state) var/obj/item/stack/sheet/metal/MS = W if (MS.get_amount() < 1) - user << "You need one sheet of metal to repair the wall." + user << "You need one sheet of metal to repair the wall!" return 1 - user << "You begin patching-up the wall with \a [MS]." + user << "You begin patching-up the wall with \a [MS]..." if (do_after(user, max(20*d_state,100)))//time taken to repair is proportional to the damage! (max 10 seconds) if(loc == null || MS.get_amount() < 1) return 1 @@ -75,7 +75,7 @@ if(1) if (istype(W, /obj/item/weapon/screwdriver)) - user << "You begin removing the support lines." + user << "You begin removing the support lines..." playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) if(do_after(user, 40)) @@ -97,7 +97,7 @@ relativewall_neighbours() //call smoothwall stuff user << "You replace the outer grille." else - user << "You need one rod to repair the wall." + user << "You need one rod to repair the wall!" return 1 return 1 @@ -106,7 +106,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) - user << "You begin slicing through the metal cover." + user << "You begin slicing through the metal cover..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 60)) @@ -121,7 +121,7 @@ if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) ) - user << "You begin slicing through the metal cover." + user << "You begin slicing through the metal cover..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 60)) @@ -137,7 +137,7 @@ if(3) if (istype(W, /obj/item/weapon/crowbar)) - user << "You struggle to pry off the cover." + user << "You struggle to pry off the cover..." playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100)) @@ -153,7 +153,7 @@ if(4) if (istype(W, /obj/item/weapon/wrench)) - user << "You start loosening the anchoring bolts which secure the support rods to their frame." + user << "You start loosening the anchoring bolts which secure the support rods to their frame..." playsound(src, 'sound/items/Ratchet.ogg', 100, 1) if(do_after(user, 40)) @@ -171,7 +171,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) - user << "You begin slicing through the support rods." + user << "You begin slicing through the support rods..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 100)) @@ -187,7 +187,7 @@ if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) ) - user << "You begin slicing through the support rods." + user << "You begin slicing through the support rods..." playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 70)) @@ -204,7 +204,7 @@ if(6) if( istype(W, /obj/item/weapon/crowbar) ) - user << "You struggle to pry off the outer sheath." + user << "You struggle to pry off the outer sheath..." playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100)) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 38dcbe609c6..7b5c0627eac 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -38,16 +38,16 @@ var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src) if(W) - user << "There is already a catwalk here." + user << "There is already a catwalk here!" return if(L) if(R.use(1)) - user << "Constructing catwalk..." + user << "You begin constructing catwalk..." playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) qdel(L) ReplaceWithCatwalk() else - user << "You need two rods to build a catwalk." + user << "You need two rods to build a catwalk!" return if(R.use(1)) user << "Constructing support lattice..." @@ -66,9 +66,9 @@ user << "You build a floor." ChangeTurf(/turf/simulated/floor/plating) else - user << "You need one floor tile to build a floor." + user << "You need one floor tile to build a floor!" else - user << "The plating is going to need some support. Place metal rods first." + user << "The plating is going to need some support! Place metal rods first." /turf/space/Entered(atom/movable/A) ..() diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index a3ba0d120b0..ca6b69118a5 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -24,4 +24,8 @@ /turf/unsimulated/floor/grass/New() ..() - icon_state = "grass[rand(1,4)]" + icon_state = "grass[rand(1,4)]" + +/turf/unsimulated/floor/abductor + name = "alien floor" + icon_state = "alienpod1" diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index e22ce3dd5fb..27392e1e9d6 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -65,4 +65,7 @@ turf/unsimulated/wall/splashscreen /turf/unsimulated/shuttle/floor name = "floor" - icon_state = "floor" \ No newline at end of file + icon_state = "floor" + +/turf/unsimulated/wall/abductor + icon_state = "alien1" \ No newline at end of file diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index ed21f09164a..c89f8d740f4 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -150,7 +150,7 @@ suiciding = 1 visible_message("[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \ "[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \ - "You hear thrashing") + "You hear thrashing.") //put em at -175 adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -176,7 +176,7 @@ else if(stat == DEAD) src << "You're already dead!" else if(stat == UNCONSCIOUS) - src << "You need to be conscious to suicide" + src << "You need to be conscious to suicide!" return /mob/living/carbon/canSuicide() diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 478231185de..03bad1dedf0 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -305,8 +305,6 @@ usr << browse(dat, "window=players;size=600x480") /datum/admins/proc/check_antagonists() - var/list/supported_continuous_modes = list("revolution", "gang", "wizard", "malfunction", "blob") - var/list/supported_midround_antag_modes = list("wizard", "malfunction", "blob") if (ticker && ticker.current_state >= GAME_STATE_PLAYING) var/dat = "
Round Status
" dat += "Current Game Mode: [ticker.mode.name]" @@ -324,11 +322,8 @@ else dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" dat += "Continuous Round Status
" - if(!ticker.mode.config_tag in supported_continuous_modes) - dat += "Continue if antagonists die" - else - dat += "[config.continuous[ticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" - if(config.continuous[ticker.mode.config_tag] && ticker.mode.config_tag in supported_midround_antag_modes) + dat += "[config.continuous[ticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" + if(config.continuous[ticker.mode.config_tag]) dat += ", [config.midround_antag[ticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]
" else dat += "
" @@ -386,7 +381,7 @@ dat += "" if(ticker.mode.A_bosses.len || ticker.mode.A_gang.len) - dat += "
| [gang_name("A")] Gang: [round((ticker.mode.A_territory.len/start_state.num_territories)*100, 0.1)]% Station Control |
| [gang_name("A")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.A] Influence, " : "")][round((ticker.mode.A_territory.len/start_state.num_territories)*100, 0.1)]% Control |
| [gang_name("B")] Gang: [round((ticker.mode.B_territory.len/start_state.num_territories)*100, 0.1)]% Station Control |
| [gang_name("B")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.B] Influence, " : "")][round((ticker.mode.B_territory.len/start_state.num_territories)*100, 0.1)]% Control |