" points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later qdel(MA) + sold_atoms += "." if(plasma_count) centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] unit(s) of exotic material.
" @@ -420,8 +426,8 @@ var/global/datum/controller/supply_shuttle/supply_shuttle if(temp) dat = temp else - dat += {"Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
-
Supply Points: [supply_shuttle.points]
+ dat += {"
Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
+
Supply Points: [supply_shuttle.points]
+
Supply Points: [supply_shuttle.points]
\nRequest items
View approved orders
@@ -451,22 +457,21 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //all_supply_groups //Request what? last_viewed_group = "categories" - temp = "Supply points: [supply_shuttle.points]
" - temp += "Main Menu
" + temp = "
" temp += "Select a category
" for(var/cat in all_supply_groups ) temp += "[get_supply_group_name(cat)]
" else last_viewed_group = href_list["order"] var/cat = text2num(last_viewed_group) - temp = "Supply points: [supply_shuttle.points]
" - temp += "Back to all categories
" + temp = "
" temp += "Request from: [get_supply_group_name(cat)]
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - else if (href_list["doorder"]) if(world.time < reqtime) say("[world.time - reqtime] seconds remaining until another requisition form may be printed.") @@ -556,19 +561,20 @@ var/global/datum/controller/supply_shuttle/supply_shuttle if (temp) dat = temp else - dat += {"
Supply shuttle
+ dat += {"
Supply shuttle
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
+
\nSupply Points: [supply_shuttle.points]
\n
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
-
\nSupply Points: [supply_shuttle.points]
\n
+
\nSupply Points: [supply_shuttle.points]
\n
[supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] [supply_shuttle.shuttle_loan ? (supply_shuttle.shuttle_loan.dispatched ? "\n*Shuttle loaned to Centcom*
\n
" : "\nLoan shuttle to Centcom (5 mins duration)
\n
") : "\n*No pending external shuttle requests*
\n
"] \nView requests
\n
\nView orders
\n
\nClose
-
\nCentral Command messages
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} +
\nCentral Command messages:
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Remember to stamp and send back the supply manifests."]"} - user << browse(dat, "window=computer;size=700x450") - onclose(user, "computer") + var/datum/browser/popup = new(user, "computer", "Supply Shuttle Console", 700, 455) + popup.set_content(dat) + popup.open() return /obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) @@ -613,7 +619,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.moving = -1 supply_shuttle.sell() supply_shuttle.send() - + investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [supply_shuttle.points]. Shuttle contents:[supply_shuttle.sold_atoms].", "cargo") else if(href_list["loan"] && supply_shuttle.shuttle_loan) if(!supply_shuttle.shuttle_loan.dispatched) @@ -635,16 +641,16 @@ var/global/datum/controller/supply_shuttle/supply_shuttle //all_supply_groups //Request what? last_viewed_group = "categories" - temp = "Supply points: [supply_shuttle.points]
" - temp += "Main Menu
" + temp = "
" temp += "Select a category
" for(var/cat in all_supply_groups ) temp += "[get_supply_group_name(cat)]
" else last_viewed_group = href_list["order"] var/cat = text2num(last_viewed_group) - temp = "Supply points: [supply_shuttle.points]
" - temp += "Back to all categories
" + temp = "
" temp += "Request from: [get_supply_group_name(cat)]
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] @@ -727,6 +733,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.points -= P.cost supply_shuttle.shoppinglist += O temp = "Thanks for your order." + investigate_log("[usr.key] has authorized an order for [P.name]. Remaining points: [supply_shuttle.points].", "cargo") else temp = "Not enough supply points." break diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 4f8b2e771e7..e98fec043ed 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -81,7 +81,7 @@ var/record_id_num = 1001 /obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) - if(H.mind && (H.mind.need_job_assign)) + if(H.mind && (H.mind.assigned_role != "MODE")) var/assignment if(H.mind.assigned_role) assignment = H.mind.assigned_role diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 67f53564deb..55fd92863e0 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -43,7 +43,8 @@ Bonus /datum/symptom/vomit/proc/Vomit(var/mob/living/M) - M.visible_message("[M] vomits on the floor!") + M.visible_message("[M] vomits on the floor!", \ + "You throw up on the floor!") M.nutrition -= 20 M.adjustToxLoss(-3) @@ -84,7 +85,8 @@ Bonus /datum/symptom/vomit/blood/Vomit(var/mob/living/M) M.Stun(1) - M.visible_message("[M] vomits on the floor!") + M.visible_message("[M] vomits on the floor!", \ + "You throw up on the floor!") // They lose blood and health. var/brute_dam = M.getBruteLoss() diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 8a628eefd62..f3a2432ebe5 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -44,7 +44,7 @@ affected_mob.nutrition -= 95 affected_mob.adjustToxLoss(-1) else - affected_mob << "You gag as you want to throw up, but there's nothing in your stomach!" + affected_mob << "You gag as you want to throw up, but there's nothing in your stomach!" affected_mob.Weaken(10) affected_mob.adjustToxLoss(3) diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 764119b587c..df96b3ca231 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -3,8 +3,8 @@ max_stages = 4 spread = "On contact" spread_type = CONTACT_GENERAL - cure = "Ryetalin" - cure = "ryetalyn" + cure = "Ryetalyn" + cure_id = "ryetalyn" curable = 0 agent = "S4E1 retrovirus" affected_species = list("Human") diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index a4897448f17..91826c2d749 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -35,6 +35,8 @@ client/verb/showrevinfo() src << "Revision unknown" src << "Current Infomational Settings:" src << "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]" + src << "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]" src << "Enforce Human Authority: [config.enforce_human_authority]" src << "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]" - return \ No newline at end of file + src << "Protect Assistant From Antagonist: [config.protect_assistant_from_antagonist]" + return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index e7e8728c481..581bb6bfe7f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -37,7 +37,6 @@ var/memory - var/need_job_assign = 1 //Whether the job controller should give them a job var/assigned_role var/special_role @@ -916,6 +915,7 @@ else current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" + assigned_role = "MODE" current << "You are a [syndicate_name()] agent!" ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) @@ -1161,6 +1161,7 @@ if(!(src in ticker.mode.wizards)) ticker.mode.wizards += src special_role = "Wizard" + assigned_role = "MODE" //ticker.mode.learn_basic_spells(current) if(!wizardstart.len) current.loc = pick(latejoin) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 0c4398b1c34..13fb01776d7 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -531,7 +531,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/storage/box/beakers, - /obj/item/weapon/storage/box/syringes) + /obj/item/weapon/storage/box/syringes, + /obj/item/weapon/storage/box/bodybags) cost = 20 containertype = /obj/structure/closet/crate/medical containername = "medical supplies crate" @@ -913,6 +914,19 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containertype = /obj/structure/largecrate/mule containername = "\improper MULEbot Crate" +/datum/supply_packs/misc/conveyor + name = "Conveyor Assembly Crate" + contains = list(/obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_switch_construct, + /obj/item/weapon/paper/conveyor) + cost = 15 + containername = "conveyor assembly crate" + /datum/supply_packs/misc/watertank name = "Water tank crate" contains = list(/obj/structure/reagent_dispensers/watertank) @@ -1040,6 +1054,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containername = "replacement lights" +/datum/supply_packs/misc/noslipfloor + name = "High-traction floor tiles" + contains = list(/obj/item/stack/tile/noslip) + amount = 20 + cost = 20 + containername = "high-traction floor tiles" + ///////////// Costumes @@ -1107,7 +1128,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine num_contained = 5 contains = list(/obj/item/weapon/contraband/poster, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, - /obj/item/weapon/lipstick/random) + /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims) name = "Contraband crate" cost = 30 containername = "crate" //let's keep it subtle, eh? @@ -1147,6 +1168,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/under/suit_jacket/navy, /obj/item/clothing/under/suit_jacket/burgundy, /obj/item/clothing/under/suit_jacket/checkered, - /obj/item/clothing/under/suit_jacket/tan) + /obj/item/clothing/under/suit_jacket/tan, + /obj/item/weapon/lipstick/random) cost = 30 //Lots of very expensive items. You gotta pay up to look good! containername = "formal-wear crate" diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index b2a606da693..63350c96e14 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -381,6 +381,12 @@ var/list/uplink_items = list() cost = 9 gamemodes = list(/datum/game_mode/nuclear) +/datum/uplink_item/badass/syndiecigs + name = "Syndicate Smokes" + desc = "Strong flavor, dense smoke, infused with Doctor's Delight." + item = /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate + cost = 4 + /datum/uplink_item/device_tools/space_suit name = "Syndicate Space Suit" desc = "The red and black syndicate space suit is less encumbering than Nanotrasen variants, fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit sightings." @@ -399,7 +405,14 @@ var/list/uplink_items = list() name = "Binary Translator Key" desc = "A key, that when inserted into a radio headset, allows you to listen to and talk with artificial intelligences and cybernetic organisms in binary. " item = /obj/item/device/encryptionkey/binary - cost = 6 + cost = 5 + surplus = 75 + +/datum/uplink_item/device_tools/encryptionkey + name = "Syndicate Encryption Key" + desc = "A key, that when inserted into a radio headset, allows you to listen to all station department channels as well as talk on an encrypted Syndicate channel." + item = /obj/item/device/encryptionkey/syndicate + cost = 5 surplus = 75 /datum/uplink_item/device_tools/ai_detector @@ -577,6 +590,7 @@ var/list/uplink_items = list() buyable_items += temp_uplink_list[category] var/list/bought_items = list() U.uses -= cost + U.used_TC = 20 var/remaining_TC = 50 var/datum/uplink_item/I @@ -591,5 +605,7 @@ var/list/uplink_items = list() bought_items += I.item remaining_TC -= I.cost + U.purchase_log += "\icon[C]" for(var/item in bought_items) new item(C) + U.purchase_log += "\icon[item]" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 907c6d89143..e5b26cc3038 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -95,18 +95,6 @@ icon = 'icons/obj/items.dmi' -/obj/item/weapon/caution - desc = "Caution! Wet Floor!" - name = "wet floor sign" - icon = 'icons/obj/janitor.dmi' - icon_state = "caution" - force = 1.0 - throwforce = 3.0 - throw_speed = 2 - throw_range = 5 - w_class = 2.0 - attack_verb = list("warned", "cautioned", "smashed") - /obj/item/weapon/rack_parts name = "rack parts" desc = "Parts of a rack." diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 9deaf9d74fb..329e9db7804 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -381,19 +381,24 @@ // find the turf to move things to var/turf/D = locate(T.x, throwy - 1, T.z) for(var/atom/movable/AM as mob|obj in T) - //mobs take damage - if(istype(AM, /mob/living)) - var/mob/living/living_mob = AM - living_mob.Paralyse(10) - living_mob.take_organ_damage(80) - living_mob.anchored = 0 //Unbuckle them so they can be moved + if(ismob(AM)) + if(istype(AM, /mob/living))//mobs take damage + var/mob/living/living_mob = AM + living_mob.Paralyse(10) + living_mob.take_organ_damage(80) + living_mob.anchored = 0 //Unbuckle them so they can be moved + else + continue + //Anything not bolted down is moved, everything else is destroyed if(!AM.anchored) - AM.Move(D) + AM.Move(D, SOUTH) else qdel(AM) if(istype(T, /turf/simulated)) del(T) - for(var/atom/movable/bug in src) // If someone (or something) is somehow still in the shuttle's docking area... - qdel(bug) + /*for(var/atom/movable/bug in src) // If someone (or something) is somehow still in the shuttle's docking area... + if(ismob(bug)) + continue + qdel(bug)*/ diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 4502ff7675f..2f1b1f6e074 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -7,7 +7,6 @@ var/fingerprintslast = null var/list/blood_DNA var/last_bumped = 0 - var/pass_flags = 0 var/throwpass = 0 ///Chemistry. @@ -203,7 +202,7 @@ its easier to just keep the beam vertical. /atom/proc/examine(mob/user) //This reformat names to get a/an properly working on item descriptions when they are bloody var/f_name = "\a [src]." - if(src.blood_DNA) + if(src.blood_DNA && !istype(src, /obj/effect/decal)) if(gender == PLURAL) f_name = "some " else @@ -366,9 +365,6 @@ var/list/blood_splatter_icons = list() else return 0 -/atom/proc/checkpass(passflag) - return pass_flags&passflag - /atom/proc/isinspace() if(istype(get_turf(src), /turf/space)) return 1 @@ -380,3 +376,11 @@ var/list/blood_splatter_icons = list() /atom/proc/handle_slip() return +/atom/proc/singularity_act() + return + +/atom/proc/singularity_pull() + return + +/atom/proc/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) + return diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 48bc30e5b41..0c5b5edfb19 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -4,24 +4,59 @@ var/anchored = 0 var/move_speed = 10 var/l_move_time = 1 - var/m_flag = 1 var/throwing = 0 var/throw_speed = 2 var/throw_range = 7 - var/moved_recently = 0 var/mob/pulledby = null var/languages = 0 //For say() and Hear() + var/inertia_dir = 0 + var/pass_flags = 0 glide_size = 8 -/atom/movable/Move() - var/atom/A = src.loc - . = ..() +/atom/movable/Move(atom/newloc, direct = 0) + if(!loc || !newloc) return 0 + var/atom/oldloc = loc + + if(loc != newloc) + if (!(direct & (direct - 1))) //Cardinal move + . = ..() + else //Diagonal move, split it into cardinal moves + if (direct & 1) + if (direct & 4) + if (step(src, NORTH)) + . = step(src, EAST) + else if (step(src, EAST)) + . = step(src, NORTH) + else if (direct & 8) + if (step(src, NORTH)) + . = step(src, WEST) + else if (step(src, WEST)) + . = step(src, NORTH) + else if (direct & 2) + if (direct & 4) + if (step(src, SOUTH)) + . = step(src, EAST) + else if (step(src, EAST)) + . = step(src, SOUTH) + else if (direct & 8) + if (step(src, SOUTH)) + . = step(src, WEST) + else if (step(src, WEST)) + . = step(src, SOUTH) + + + if(!loc || (loc == oldloc && oldloc != newloc)) + last_move = 0 + return + + last_move = direct src.move_speed = world.timeofday - src.l_move_time src.l_move_time = world.timeofday - src.m_flag = 1 - if ((A != src.loc && A && A.z == src.z)) - src.last_move = get_dir(A, src.loc) - return + + spawn(5) // Causes space drifting. /tg/station has no concept of speed, we just use 5 + if(loc && direct && last_move == direct) + if(loc == newloc) //Remove this check and people can accelerate. Not opening that can of worms just yet. + newtonian_move(last_move) /atom/movable/Del() if(isnull(gc_destroyed) && loc) @@ -70,6 +105,41 @@ return 1 return 0 +//Called whenever an object moves and by mobs when they attempt to move themselves through space +//And when an object or action applies a force on src, see newtonian_move() below +//Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting +//Mobs should return 1 if they should be able to move of their own volition, see client/Move() in mob_movement.dm +//movement_dir == 0 when stopping or any dir when trying to move +/atom/movable/proc/Process_Spacemove(var/movement_dir = 0) + if(has_gravity(src)) + return 1 + + if(pulledby) + return 1 + + if(locate(/obj/structure/lattice) in orange(1, get_turf(src))) //Not realistic but makes pushing things in space easier + return 1 + + return 0 + +/atom/movable/proc/newtonian_move(direction) //Only moves the object if it's under no gravity + + if(!loc || Process_Spacemove(0)) + inertia_dir = 0 + return 0 + + inertia_dir = direction + if(!direction) + return 1 + + + var/old_dir = dir + . = step(src, direction) + dir = old_dir + +/atom/movable/proc/checkpass(passflag) + return pass_flags&passflag + /atom/movable/proc/hit_check() // todo: this is partly obsolete due to passflags already, add throwing stuff to mob CanPass and finish it if(src.throwing) for(var/atom/A in get_turf(src)) @@ -117,7 +187,7 @@ var/atom/step = get_step(src, (error < 0) ? tdy : tdx) if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge break - src.Move(step) + src.Move(step, get_dir(loc, step)) hit_check() error += (error < 0) ? tdist_x : -tdist_y; dist_travelled++ @@ -130,7 +200,7 @@ src.throwing = 0 if(isobj(src)) src.throw_impact(get_turf(src)) - + return 1 diff --git a/code/game/communications.dm b/code/game/communications.dm index ded4c70d7a3..2c325b398f3 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -176,6 +176,9 @@ var/const/RADIO_AIRLOCK = "6" var/const/RADIO_SECBOT = "7" var/const/RADIO_MULEBOT = "8" var/const/RADIO_MAGNETS = "9" +var/const/RADIO_CLEANBOT = "10" +var/const/RADIO_FLOORBOT = "11" +var/const/RADIO_MEDBOT = "12" var/global/datum/controller/radio/radio_controller diff --git a/code/game/dna.dm b/code/game/dna.dm index cbd8ee69f33..f3e79618e99 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -340,6 +340,7 @@ var/locked = 0 var/open = 0 anchored = 1 + interact_offline = 1 use_power = 1 idle_power_usage = 50 active_power_usage = 300 @@ -371,6 +372,29 @@ for(var/obj/item/weapon/stock_parts/micro_laser/P in component_parts) damage_coeff = P.rating +/obj/machinery/dna_scannernew/update_icon() + + //no power or maintenance + if(stat & (NOPOWER|BROKEN)) + icon_state = initial(icon_state)+ (open ? "_open" : "") + "_unpowered" + return + + if((stat & MAINT) || panel_open) + icon_state = initial(icon_state)+ (open ? "_open" : "") + "_maintenance" + return + + //running and someone in there + if(occupant) + icon_state = initial(icon_state)+ "_occupied" + return + + //running + icon_state = initial(icon_state)+ (open ? "_open" : "") + +/obj/machinery/dna_scannernew/power_change() + ..() + update_icon() + /obj/machinery/dna_scannernew/proc/toggle_open(mob/user=usr) if(!user) return @@ -383,8 +407,8 @@ if(open || !locked) //Open and unlocked, no need to escape open = 1 return - user.changeNext_move(100) - user.last_special = world.time + 100 + 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]!") @@ -414,7 +438,7 @@ C.loc = src C.stop_pulling() break - icon_state = initial(icon_state) + (occupant ? "_occupied" : "") + update_icon() // search for ghosts, if the corpse is empty and the scanner is connected to a cloner if(occupant) @@ -451,7 +475,7 @@ occupant.client.eye = occupant occupant.client.perspective = MOB_PERSPECTIVE occupant = null - icon_state = "[initial(icon_state)]_open" + update_icon() return 1 /obj/machinery/dna_scannernew/relaymove(mob/user as mob) @@ -462,7 +486,8 @@ /obj/machinery/dna_scannernew/attackby(obj/item/weapon/grab/G, mob/user) - if(!occupant && default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", "[initial(icon_state)]", G)) + if(!occupant && default_deconstruction_screwdriver(user, icon_state, icon_state, G))//sent icon_state is irrelevant... + update_icon()//..since we're updating the icon here, since the scanner can be unpowered when opened/closed return if(exchange_parts(user, G)) @@ -486,6 +511,8 @@ qdel(G) /obj/machinery/dna_scannernew/attack_hand(mob/user) + if(..()) + return toggle_open(user) add_fingerprint(user) @@ -578,7 +605,7 @@ var/occupant_status = "
Subject Status:
"
var/scanner_status
var/temp_html
- if(connected)
+ if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
if(check_dna_integrity(viable_occupant) && (!(NOCLONE in viable_occupant.mutations) || (connected.scan_level == 3))) //occupent is viable for dna modification
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 9bcc166edfd..903a983e7df 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -16,7 +16,6 @@ var/list/blob_nodes = list()
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
- pre_setup_before_jobs = 1
var/declared = 0
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index c7663326236..1cbf0f81d72 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -38,7 +38,7 @@
/mob/living/simple_animal/hostile/blobspore/blob_act()
return
-/mob/living/simple_animal/hostile/blobspore/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/mob/living/simple_animal/hostile/blobspore/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover, /obj/effect/blob))
return 1
return ..()
@@ -131,6 +131,7 @@
maxbodytemp = 360
force_threshold = 10
environment_smash = 3
+ mob_size = 2
/mob/living/simple_animal/hostile/blobbernaut/AttackingTarget()
diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm
index e954cba6a4d..1c145f4404f 100644
--- a/code/game/gamemodes/blob/blobs/shield.dm
+++ b/code/game/gamemodes/blob/blobs/shield.dm
@@ -16,6 +16,6 @@
/obj/effect/blob/shield/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
-/obj/effect/blob/shield/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/effect/blob/shield/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover) && mover.checkpass(PASSBLOB)) return 1
return 0
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index d4f0d21229e..c1325118245 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -30,8 +30,8 @@
..()
-/obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
- if(air_group || (height==0)) return 1
+/obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0)
+ if(height==0) return 1
if(istype(mover) && mover.checkpass(PASSBLOB)) return 1
return 0
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index f131ca65f68..d0a5ec0ba2c 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -13,7 +13,6 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
required_players = 15
required_enemies = 1
recommended_enemies = 4
- pre_setup_before_jobs = 1
var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time
@@ -44,6 +43,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
if(config.protect_roles_from_antagonist)
restricted_jobs += protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ restricted_jobs += "Assistant"
+
var/num_changelings = 1
if(config.changeling_scaling_coeff)
diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm
index 06c59138291..951cdf80f54 100644
--- a/code/game/gamemodes/changeling/powers/humanform.dm
+++ b/code/game/gamemodes/changeling/powers/humanform.dm
@@ -20,7 +20,8 @@
var/datum/dna/chosen_dna = changeling.get_dna(chosen_name)
if(!chosen_dna)
return
-
+ if(!user || user.notransform)
+ return 0
user << "We transform our appearance."
user.dna = chosen_dna
diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm
index 10f61e1b6e0..b9220f4044b 100644
--- a/code/game/gamemodes/changeling/powers/lesserform.dm
+++ b/code/game/gamemodes/changeling/powers/lesserform.dm
@@ -8,6 +8,8 @@
//Transform into a monkey.
/obj/effect/proc_holder/changeling/lesserform/sting_action(var/mob/living/carbon/human/user)
+ if(!user || user.notransform)
+ return 0
user << "Our genes cry out!"
user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPSE | TR_KEEPSRC)
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index e1f84aeecde..6f13e670890 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -26,6 +26,9 @@
if(config.protect_roles_from_antagonist)
restricted_jobs += protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ restricted_jobs += "Assistant"
+
var/list/datum/mind/possible_changelings = get_players_for_role(BE_CHANGELING)
var/num_changelings = 1
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 0c7f68f88ee..eb67ca4895d 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -29,7 +29,6 @@
required_players = 20
required_enemies = 6
recommended_enemies = 6
- pre_setup_before_jobs = 1
var/finished = 0
@@ -63,6 +62,9 @@
if(config.protect_roles_from_antagonist)
restricted_jobs += protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ restricted_jobs += "Assistant"
+
for(var/datum/mind/player in antag_candidates)
for(var/job in restricted_jobs)//Removing heads and such from the list
if(player.assigned_role == job)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index fb07c3c966c..c4eede9feff 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -57,7 +57,7 @@ var/list/sacrificed = list()
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
qdel(src)
- for(var/mob/living/carbon/C in orange(1,src))
+ for(var/mob/living/C in orange(1,src))
if(iscultist(C) && !C.stat)
culcount++
if(user.loc==src.loc)
@@ -98,13 +98,13 @@ var/list/sacrificed = list()
/////////////////////////////////////////THIRD RUNE
/obj/effect/rune/proc/convert()
- var/list/mob/living/carbon/human/cultsinrange = list()
+ var/list/mob/living/cultsinrange = list()
for(var/mob/living/carbon/M in src.loc)
if(iscultist(M))
continue
if(M.stat==2)
continue
- for(var/mob/living/carbon/C in orange(1,src))
+ for(var/mob/living/C in orange(1,src))
if(iscultist(C) && !C.stat) //converting requires three cultists
cultsinrange += C
C.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!")
@@ -792,12 +792,12 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/freedom()
var/mob/living/user = usr
- var/list/mob/living/carbon/cultists = new
+ var/list/mob/living/cultists = new
for(var/datum/mind/H in ticker.mode.cult)
if (istype(H.current,/mob/living/carbon))
cultists+=H.current
- var/list/mob/living/carbon/users = new
- for(var/mob/living/carbon/C in orange(1,src))
+ var/list/mob/living/users = new
+ for(var/mob/living/C in orange(1,src))
if(iscultist(C) && !C.stat)
users+=C
if(users.len>=1)
@@ -832,7 +832,7 @@ var/list/sacrificed = list()
cultist.loc:locked = 0
if(istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked)
cultist.loc:locked = 0
- for(var/mob/living/carbon/C in users)
+ for(var/mob/living/C in users)
user.take_overall_damage(15, 0)
C.say("Khari[pick("'","`")]d! Gual'te nikka!")
qdel(src)
@@ -846,8 +846,8 @@ var/list/sacrificed = list()
for(var/datum/mind/H in ticker.mode.cult)
if (istype(H.current,/mob/living/carbon))
cultists+=H.current
- var/list/mob/living/carbon/users = new
- for(var/mob/living/carbon/C in orange(1,src))
+ var/list/mob/living/users = new
+ for(var/mob/living/C in orange(1,src))
if(iscultist(C) && !C.stat)
users+=C
if(users.len>=3)
@@ -862,7 +862,7 @@ var/list/sacrificed = list()
cultist.loc = src.loc
cultist.Weaken(5)
cultist.regenerate_icons()
- for(var/mob/living/carbon/human/C in orange(1,src))
+ for(var/mob/living/C in orange(1,src))
if(iscultist(C) && !C.stat)
C.say("N'ath reth sh'yro eth d[pick("'","`")]rekkathnor!")
C.take_overall_damage(25, 0)
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 2d9ab0ed8c3..e828b3d1014 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -275,12 +275,11 @@ var/round_start_time = 0
/datum/controller/gameticker/proc/equip_characters()
var/captainless=1
for(var/mob/living/carbon/human/player in player_list)
- if(!player.mind.need_job_assign)
- continue
if(player && player.mind && player.mind.assigned_role)
if(player.mind.assigned_role == "Captain")
captainless=0
- job_master.EquipRank(player, player.mind.assigned_role, 0)
+ if(player.mind.assigned_role != "MODE")
+ job_master.EquipRank(player, player.mind.assigned_role, 0)
if(captainless)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index a9faa393a0a..9a4374959f7 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -33,6 +33,9 @@
if(config.protect_roles_from_antagonist)
restricted_jobs += protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ restricted_jobs += "Assistant"
+
for(var/datum/mind/player in antag_candidates)
for(var/job in restricted_jobs)//Removing heads and such from the list
if(player.assigned_role == job)
@@ -46,12 +49,6 @@
if(!A_bosses.len || !B_bosses.len)
return 0
-//Set a temporary special_role so the job controller doesn't hand out invalid jobs for these antags
- for(var/datum/mind/boss_mind in A_bosses)
- boss_mind.special_role = "Gang member"
- for(var/datum/mind/boss_mind in B_bosses)
- boss_mind.special_role = "Gang member"
-
return 1
diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm
index 8cf8a3ec813..3ea9dc6294c 100644
--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -48,7 +48,7 @@
if (malf_ai.len < required_enemies)
return 0
for(var/datum/mind/ai_mind in malf_ai)
- ai_mind.need_job_assign = 0
+ ai_mind.assigned_role = "MODE"
ai_mind.special_role = "malfunctioning AI"//So they actually have a special role/N
log_game("[ai_mind.key] (ckey) has been selected as a malf AI")
return 1
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index b9ed5c88c54..48b2ad711e1 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -8,6 +8,8 @@
/var/list/meteorsC = list(/obj/effect/meteor/dust) //for space dust event
+/var/list/meteorsSPOOKY = list(/obj/effect/meteor/pumpkin)
+
/proc/spawn_meteors(var/number = 10, var/list/meteortypes)
for(var/i = 0; i < number; i++)
spawn_meteor(meteortypes)
@@ -83,7 +85,7 @@
pass_flags = PASSTABLE
var/heavy = 0
var/meteorsound = 'sound/effects/meteorimpact.ogg'
- var/z_original
+ var/z_original = 1
var/meteordrop = /obj/item/weapon/ore/iron
var/dropamt = 2
@@ -91,6 +93,7 @@
/obj/effect/meteor/Move()
if(z != z_original || loc == dest)
qdel(src)
+ return
return ..()
/obj/effect/meteor/Destroy()
@@ -132,6 +135,23 @@
heavy = 1
meteordrop = /obj/item/weapon/ore/uranium
+//////////////////////////
+//Spookoween meteors
+/obj/effect/meteor/pumpkin
+ name = "PUMPKING"
+ desc = "THE PUMPKING'S COMING!"
+ icon = 'icons/obj/meteor_spooky.dmi'
+ icon_state = "pumpkin"
+ hits = 10
+ heavy = 1
+ dropamt = 1
+
+/obj/effect/meteor/pumpkin/New()
+ ..()
+ meteordrop = pick(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin)
+ meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg')
+//////////////////////////
+
/obj/effect/meteor/meaty
name = "meaty ore"
icon_state = "meateor"
diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm
index c12ba003926..266a7c35e06 100644
--- a/code/game/gamemodes/monkey/monkey.dm
+++ b/code/game/gamemodes/monkey/monkey.dm
@@ -11,7 +11,6 @@
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
- pre_setup_before_jobs = 1
var/carriers_to_make = 1
var/list/carriers = list()
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index e9841f6b0a7..913aaef67bd 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -40,7 +40,7 @@
agent_number--
for(var/datum/mind/synd_mind in syndicates)
- synd_mind.need_job_assign = 0
+ synd_mind.assigned_role = "MODE"
synd_mind.special_role = "Syndicate"//So they actually have a special role/N
log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative")
return 1
@@ -202,7 +202,6 @@
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id)
if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back)
if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back)
- synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt)
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
@@ -214,6 +213,7 @@
var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob)
E.imp_in = synd_mob
E.implanted = 1
+ E.implanted(synd_mob)
synd_mob.faction |= "syndicate"
synd_mob.update_icons()
return 1
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 8a78f9b33ae..6b7cefc3cc8 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -16,6 +16,7 @@ var/bomb_set
var/obj/item/weapon/disk/nuclear/auth = null
use_power = 0
var/previous_level = ""
+ var/lastentered = ""
/obj/machinery/nuclearbomb/process()
if (src.timing)
@@ -98,9 +99,15 @@ var/bomb_set
src.yes_code = 0
src.code = null
else
- src.code += text("[]", href_list["type"])
- if (length(src.code) > 5)
- src.code = "ERROR"
+ lastentered = text("[]", href_list["type"])
+ if (text2num(lastentered) == null)
+ var/turf/LOC = get_turf(usr)
+ message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered] ! ([LOC ? "JMP" : "null"])", 0)
+ log_admin("EXPLOIT : [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered] !")
+ else
+ src.code += lastentered
+ if (length(src.code) > 5)
+ src.code = "ERROR"
if (src.yes_code)
if (href_list["time"])
var/time = text2num(href_list["time"])
@@ -232,9 +239,10 @@ var/bomb_set
if(blobstart.len > 0)
var/obj/item/weapon/disk/nuclear/NEWDISK = new(pick(blobstart))
transfer_fingerprints_to(NEWDISK)
- message_admins("[src] has been destroyed in ([x], [y] ,[z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).")
- log_game("[src] has been destroyed in ([x], [y] ,[z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).")
+ var/turf/diskturf = get_turf(src)
+ message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).")
+ log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).")
del(src) //Needed to clear all references to it
else
ERROR("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.")
- return 1 // Cancel destruction.
\ No newline at end of file
+ return 1 // Cancel destruction.
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 0b07f069680..16d32663163 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -77,7 +77,7 @@
point_at(location)
if(mode == 2)
point_at(target)
- usr << "You activate the pinpointer.,/span>"
+ usr << "You activate the pinpointer."
else
active = 0
icon_state = "pinoff"
@@ -89,6 +89,9 @@
set name = "Toggle Pinpointer Mode"
set src in view(1)
+ if(usr.stat || usr.restrained() || !usr.canmove)
+ return
+
active = 0
icon_state = "pinoff"
target=null
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 0d790710241..0390064db5c 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -33,6 +33,12 @@ datum/objective_item/steal/jetpack
targetitem = /obj/item/weapon/tank/jetpack
difficulty = 3
+datum/objective_item/steal/defib
+ name = "a defibrillator"
+ targetitem = /obj/item/weapon/defibrillator
+ difficulty = 4
+ excludefromjob = list("Chief Medical Officer", "Medical Doctor")
+
datum/objective_item/steal/magboots
name = "the chief engineer's advanced magnetic boots"
targetitem = /obj/item/clothing/shoes/magboots/advance
@@ -107,13 +113,13 @@ datum/objective_item/functionalai/check_special_completion(var/obj/item/device/a
datum/objective_item/steal/blueprints
name = "the station blueprints"
- targetitem = /obj/item/blueprints
+ targetitem = /obj/item/areaeditor/blueprints
difficulty = 10
excludefromjob = list("Chief Engineer")
altitems = list(/obj/item/weapon/photo)
datum/objective_item/blueprints/check_special_completion(var/obj/item/I)
- if(istype(I, /obj/item/blueprints))
+ if(istype(I, /obj/item/areaeditor/blueprints))
return 1
if(istype(I, /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = I
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index e850f817e52..b7dbbce85bc 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -17,9 +17,8 @@
antag_flag = BE_REV
restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
required_players = 20
- required_enemies = 3
+ required_enemies = 1
recommended_enemies = 3
- pre_setup_before_jobs = 1
var/finished = 0
var/check_counter = 0
@@ -42,6 +41,9 @@
if(config.protect_roles_from_antagonist)
restricted_jobs += protected_jobs
+ if(config.protect_assistant_from_antagonist)
+ restricted_jobs += "Assistant"
+
var/head_check = 0
for(var/mob/new_player/player in player_list)
if(player.mind.assigned_role in command_positions)
@@ -53,17 +55,12 @@
if(player.assigned_role == job)
antag_candidates -= player
- var/list/heads = get_living_heads()
- if(heads.len < max_headrevs)
- max_headrevs = heads.len
-
for (var/i=1 to max_headrevs)
if (antag_candidates.len==0)
break
var/datum/mind/lenin = pick(antag_candidates)
antag_candidates -= lenin
head_revolutionaries += lenin
- log_game("[lenin.key] (ckey) has been selected as a head rev")
if((head_revolutionaries.len < required_enemies)||(!head_check))
return 0
@@ -74,9 +71,14 @@
/datum/game_mode/revolution/post_setup()
var/list/heads = get_living_heads()
- heads_to_kill = heads
+ while(heads.len < head_revolutionaries.len) //das vi danya
+ var/datum/mind/trotsky = pick(head_revolutionaries)
+ antag_candidates += trotsky
+ head_revolutionaries -= trotsky
+ update_rev_icons_removed(trotsky)
for(var/datum/mind/rev_mind in head_revolutionaries)
+ log_game("[rev_mind.key] (ckey) has been selected as a head rev")
for(var/datum/mind/head_mind in heads)
mark_for_death(rev_mind, head_mind)
@@ -161,6 +163,7 @@
rev_obj.target = head_mind
rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]."
rev_mind.objectives += rev_obj
+ heads_to_kill += head_mind
////////////////////////////////////////////
//Checks if new heads have joined midround//
@@ -491,4 +494,4 @@
text += ""
text += "
" - world << text + world << text diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 0f30a1af738..7e4fb0e05fd 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -5,7 +5,6 @@ required_players = 25 required_enemies = 5 recommended_enemies = 8 - pre_setup_before_jobs = 1 traitor_name = "double agent" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 2c4d9aaab5b..d1c5b769b03 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -15,7 +15,6 @@ required_players = 0 required_enemies = 1 recommended_enemies = 4 - pre_setup_before_jobs = 1 var/traitors_possible = 4 //hard limit on traitors if scaling is turned off var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. @@ -31,6 +30,9 @@ if(config.protect_roles_from_antagonist) restricted_jobs += protected_jobs + if(config.protect_assistant_from_antagonist) + restricted_jobs += "Assistant" + var/num_traitors = 1 if(config.traitor_scaling_coeff) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index e8560103ecc..1aaee715f37 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -58,7 +58,7 @@ if("doublebarrel") new /obj/item/weapon/gun/projectile/revolver/doublebarrel(get_turf(H)) if("shotgun") - new /obj/item/weapon/gun/projectile/shotgun/(get_turf(H)) + new /obj/item/weapon/gun/projectile/shotgun(get_turf(H)) if("combatshotgun") new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H)) if("mateba") diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index ef97dcc54cf..7fafb6f14f5 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -21,7 +21,7 @@ var/datum/mind/wizard = pick(antag_candidates) wizards += wizard modePlayer += wizard - wizard.need_job_assign = 0 + wizard.assigned_role = "MODE" wizard.special_role = "Wizard" if(wizardstart.len == 0) wizard.current << "A starting location for you could not be found, please report this bug!" diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index d23c954f352..4c67f3feac4 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -14,8 +14,8 @@ Assistant minimal_access = list() //See /datum/job/assistant/get_access() /datum/job/assistant/equip_items(var/mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/random(H), slot_w_uniform) /datum/job/assistant/get_access() if(config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) //Config has assistant maint access set diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 7ea6afcadf5..e7b5df5df67 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -137,7 +137,7 @@ Cargo Technician department_head = list("Head of Personnel") department_flag = CIVILIAN faction = "Station" - total_positions = 2 + total_positions = 3 spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index f45733dd62e..c0975987618 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -75,7 +75,7 @@ Roboticist department_flag = MEDSCI faction = "Station" total_positions = 2 - spawn_positions = 1 + spawn_positions = 2 supervisors = "research director" selection_color = "#ffeeff" diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 5aa5448c8c3..613b07e545c 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -84,7 +84,7 @@ Warden H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) @@ -175,7 +175,7 @@ Security Officer H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_r_store) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 57365511158..906f167875d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -46,11 +46,6 @@ var/global/datum/controller/occupations/job_master if(!job) return 0 if(jobban_isbanned(player, rank)) return 0 if(!job.player_old_enough(player.client)) return 0 - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - return 0 - if(!player.mind.need_job_assign) - return 0 var/position_limit = job.total_positions if(!latejoin) position_limit = job.spawn_positions @@ -82,14 +77,6 @@ var/global/datum/controller/occupations/job_master Debug("FOC non-human failed, Player: [player]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("FOC player has a special role and this job is blocked from this special role") - continue - - if(!player.mind.need_job_assign) - continue - if(player.client.prefs.GetJobDepartment(job, level) & job.flag) Debug("FOC pass, Player: [player], Level:[level]") candidates += player @@ -119,13 +106,6 @@ var/global/datum/controller/occupations/job_master Debug("GRJ non-human failed, Player: [player]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("GRJ player has a special role and this job is blocked from this special role") - continue - - if(!player.mind.need_job_assign) - continue if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) Debug("GRJ Random job given, Player: [player], Job: [job]") @@ -143,7 +123,7 @@ var/global/datum/controller/occupations/job_master return -//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until� +//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until //it locates a head or runs out of levels to check //This is basically to ensure that there's atleast a few heads in the round /datum/controller/occupations/proc/FillHeadPosition() @@ -282,13 +262,6 @@ var/global/datum/controller/occupations/job_master Debug("DO non-human failed, Player: [player], Job:[job.title]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("DO player has a special role and this job is blocked from that special role") - continue - - if(!player.mind.need_job_assign) - continue // If the player wants that job on this level, then try give it to him. if(player.client.prefs.GetJobDepartment(job, level) & job.flag) @@ -302,6 +275,10 @@ var/global/datum/controller/occupations/job_master // Hand out random jobs to the people who didn't get any in the last check // Also makes sure that they got their preference correct + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, "Assistant")) + GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul + for(var/mob/new_player/player in unassigned) if(player.client.prefs.userandomjob) GiveRandomJob(player) @@ -318,8 +295,6 @@ var/global/datum/controller/occupations/job_master //Gives the player the stuff he should have with his rank /datum/controller/occupations/proc/EquipRank(var/mob/living/H, var/rank, var/joined_late = 0) - if(!H.mind.need_job_assign) - return 0 var/datum/job/job = GetJob(rank) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c62958f84db..14bf5181d8f 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -73,7 +73,7 @@ var/list/engineering_positions = list( var/list/medical_positions = list( "Chief Medical Officer", "Medical Doctor", - "Geneticist", //Part of both medical and science + "Geneticist", "Virologist", "Chemist" ) @@ -82,7 +82,6 @@ var/list/medical_positions = list( var/list/science_positions = list( "Research Director", "Scientist", - "Geneticist", //Part of both medical and science "Roboticist" ) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f59ff9c6f1e..5bc8aeaa702 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -80,6 +80,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if(storedpda) storedpda.loc = get_turf(src.loc) storedpda = null diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7e5801c56fe..71275ae4f4b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,8 +11,9 @@ icon_state = "sleeper-open" density = 0 anchored = 1 - var/efficiency + interact_offline = 1 state_open = 1 + var/efficiency var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible @@ -132,11 +133,17 @@ open_machine() /obj/machinery/sleeper/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine if(state_open) close_machine() else open_machine() + else sleeperUI(user) @@ -233,6 +240,8 @@ ..(target) /obj/machinery/sleeper/proc/inject_chem(mob/user, chem) + if(!is_operational()) + return if(occupant && occupant.reagents) if(chem in injection_chems + "inaprovaline") if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 0467c3c3d62..f64917ebf06 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -851,7 +851,8 @@ table tr:first-child th:first-child { border: none;} else stat |= NOPOWER spawn(rand(0,15)) - update_icon() + if(loc) + update_icon() /* AIR ALARM CIRCUIT @@ -1084,10 +1085,10 @@ FIRE ALARM /obj/machinery/firealarm/power_change() if(powered(ENVIRON)) stat &= ~NOPOWER - update_icon() else - spawn(rand(0,15)) - stat |= NOPOWER + stat |= NOPOWER + spawn(rand(0,15)) + if(loc) update_icon() /obj/machinery/firealarm/attack_hand(mob/user as mob) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index cfa87d4ae4e..9345d395957 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -18,6 +18,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/airlock_electronics(), \ new /obj/item/weapon/airalarm_electronics(), \ new /obj/item/weapon/firealarm_electronics(), \ + new /obj/item/device/pipe_painter(), \ new /obj/item/stack/sheet/metal(), \ new /obj/item/stack/sheet/glass(), \ new /obj/item/stack/sheet/rglass(), \ @@ -54,7 +55,7 @@ var/global/list/autolathe_recipes = list( \ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/weapon/flamethrower/full(), \ new /obj/item/weapon/rcd(), \ - new /obj/item/device/radio/electropack(), \ + new /obj/item/device/electropack(), \ new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/weapon/restraints/handcuffs(), \ new /obj/item/ammo_box/a357(), \ @@ -246,13 +247,13 @@ var/global/list/autolathe_recipes_hidden = list( \ if(istype(template, /obj/item/stack)) src.m_amount -= template.m_amt*multiplier src.g_amount -= template.g_amt*multiplier - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) var/obj/item/stack/S = new_item S.amount = multiplier else src.m_amount -= template.m_amt/coeff src.g_amount -= template.g_amt/coeff - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) new_item.m_amt /= coeff new_item.g_amt /= coeff if(src.m_amount < 0) @@ -286,7 +287,7 @@ var/global/list/autolathe_recipes_hidden = list( \ objs += src.L if(src.hacked) objs += src.LL - for(var/obj/t in objs) + for(var/obj/item/t in objs) if(disabled || m_amount[t] ", "The ", "")
else
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index e800a4b9967..40fb4776d87 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -6,6 +6,7 @@
luminosity = 3
use_power = 0
var/obj/item/weapon/card/id/botcard // the ID card that the bot "holds"
+ var/list/prev_access = list()
var/on = 1
var/health = 0 //do not forget to set health for your bot!
var/maxhealth = 0
@@ -14,8 +15,74 @@
var/open = 0//Maint panel
var/locked = 1
var/hacked = 0 //Used to differentiate between being hacked by silicons and emagged by humans.
+ var/text_hack = "" //Custom text returned to a silicon upon hacking a bot.
+ var/text_dehack = "" //Text shown when resetting a bots hacked status to normal.
+ var/text_dehack_fail = "" //Shown when a silicon tries to reset a bot emagged with the emag item, which cannot be reset.
+ var/declare_message = "" //What the bot will display to the HUD user.
+ var/frustration = 0 //Used by some bots for tracking failures to reach their target.
+ var/speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick.
+ var/turf/ai_waypoint //The end point of a bot's path, or the target location.
+ var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint.
+ var/pathset = 0
+ var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore.
+ var/mode = 0 //Standardizes the vars that indicate the bot is busy with its function.
+ var/tries = 0 //Number of times the bot tried and failed to move.
+ var/remote_disabled = 0 //If enabled, the AI cannot *Remotely* control a bot. It can still control it through cameras.
+ var/mob/living/silicon/ai/calling_ai //Links a bot to the AI calling it.
+ var/obj/item/device/radio/Radio //The bot's radio, for speaking to people.
+ var/radio_frequency //The bot's default radio speaking freqency. Recommended to be on a department frequency.
//var/emagged = 0 //Urist: Moving that var to the general /bot tree as it's used by most bots
+ var/auto_patrol = 0// set to make bot automatically patrol
+ var/turf/patrol_target // this is turf to navigate to (location of beacon)
+ var/turf/summon_target // The turf of a user summoning a bot.
+ var/new_destination // pending new destination (waiting for beacon response)
+ var/destination // destination description tag
+ var/next_destination // the next destination in the patrol route
+ var/blockcount = 0 //number of times retried a blocked path
+ var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
+
+ var/nearest_beacon // the nearest beacon's tag
+ var/turf/nearest_beacon_loc // the nearest beacon's location
+
+ var/beacon_freq = 1445 // navigation beacon frequency
+ var/control_freq = 1447 // bot control frequency
+
+ var/bot_filter // The radio filter the bot uses to identify itself on the network.
+
+ var/bot_type = 0 //The type of bot it is, for radio control.
+ #define SEC_BOT 1 // Secutritrons (Beepsky) and ED-209s
+ #define MULE_BOT 2 // MULEbots
+ #define FLOOR_BOT 3 // Floorbots
+ #define CLEAN_BOT 4 // Cleanbots
+ #define MED_BOT 5 // Medibots
+
+ #define DEFAULT_SCAN_RANGE 7 //default view range for finding targets.
+
+ //Mode defines
+ #define BOT_IDLE 0 // idle
+ #define BOT_HUNT 1 // found target, hunting
+ #define BOT_PREP_ARREST 2 // at target, preparing to arrest
+ #define BOT_ARREST 3 // arresting target
+ #define BOT_START_PATROL 4 // start patrol
+ #define BOT_PATROL 5 // patrolling
+ #define BOT_SUMMON 6 // summoned by PDA
+ #define BOT_CLEANING 7 // cleaning (cleanbots)
+ #define BOT_REPAIRING 8 // repairing hull breaches (floorbots)
+ #define BOT_MOVING 9 // for clean/floor bots, when moving.
+ #define BOT_HEALING 10 // healing people (medbots)
+ #define BOT_RESPONDING 11 // responding to a call from the AI
+ #define BOT_LOADING 12 // loading/unloading
+ #define BOT_DELIVER 13 // moving to deliver
+ #define BOT_GO_HOME 14 // returning to home
+ #define BOT_BLOCKED 15 // blocked
+ #define BOT_NAV 16 // computing navigation
+ #define BOT_WAIT_FOR_NAV 17 // waiting for nav computation
+ #define BOT_NO_ROUTE 18 // no destination beacon found (or no route)
+ var/list/mode_name = list("In Pursuit","Preparing to Arrest","Arresting","Beginning Patrol","Patrolling","Summoned by PDA", \
+ "Cleaning", "Repairing", "Proceeding to work site","Healing","Responding","Loading/Unloading","Navigating to Delivery Location","Navigating to Home", \
+ "Waiting for clear path","Calculating navigation path","Pinging beacon network","Unable to reach destination")
+ //This holds text for what the bot is mode doing, reported on the AI's bot control interface.
/obj/machinery/bot/proc/turn_on()
if(stat) return 0
@@ -26,26 +93,49 @@
/obj/machinery/bot/proc/turn_off()
on = 0
SetLuminosity(0)
+ bot_reset() //Resets an AI's call, should it exist.
+
+/obj/machinery/bot/New()
+ ..()
+ aibots += src //Global bot list
+ botcard = new /obj/item/weapon/card/id(src)
+ set_custom_texts()
+ Radio = new /obj/item/device/radio(src)
+ Radio.listening = 0 //Makes bot radios transmit only so no one hears things while adjacent to one.
+
+
+/obj/machinery/bot/proc/add_to_beacons(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
+ if(radio_controller)
+ radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ if(bot_filter)
+ radio_controller.add_object(src, control_freq, filter = bot_filter)
/obj/machinery/bot/proc/explode()
+ aibots -= src
qdel(src)
/obj/machinery/bot/proc/healthcheck()
- if (src.health <= 0)
- src.explode()
+ if (health <= 0)
+ explode()
-/obj/machinery/bot/proc/Emag(mob/user as mob)
- if(locked)
+/obj/machinery/bot/proc/Emag(mob/user as mob) //Master Emag proc. Ensure this is called in your bot before setting unique functions.
+ 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."
- if(!locked && open)
+ 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.
+ locked = 1 //Access denied forever!
+ 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."
/obj/machinery/bot/examine(mob/user)
..()
- if (src.health < maxhealth)
- if (src.health > maxhealth/3)
+ if (health < maxhealth)
+ if (health > maxhealth/3)
user << "[src]'s parts look loose."
else
user << "[src]'s parts look very loose."
@@ -54,82 +144,160 @@
/obj/machinery/bot/attack_alien(var/mob/living/carbon/alien/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
- src.health -= rand(15,30)*brute_dam_coeff
- src.visible_message("[user] has slashed [src]!")
- playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ health -= rand(15,30)*brute_dam_coeff
+ visible_message("[user] has slashed [src]!")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
if(prob(10))
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
healthcheck()
/obj/machinery/bot/attack_animal(var/mob/living/simple_animal/M as mob)
- if(M.melee_damage_upper == 0) return
+ if(M.melee_damage_upper == 0)
+ return
M.changeNext_move(CLICK_CD_MELEE)
- src.health -= M.melee_damage_upper
- src.visible_message("[M] has [M.attacktext] [src]!")
+ health -= M.melee_damage_upper
+ visible_message("[M] has [M.attacktext] [src]!")
add_logs(M, src, "attacked", admin=0)
if(prob(10))
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
healthcheck()
+/obj/machinery/bot/Topic(href, href_list) //Master Topic to handle common functions.
+ . = ..()
+ if (.)
+ return
+ if(topic_denied(usr))
+ usr << "[src]'s interface is not responding!"
+ href_list = list()
+ return
+ usr.set_machine(src)
+ add_fingerprint(usr)
+ if((href_list["power"]) && (allowed(usr) || !locked))
+ if (on)
+ turn_off()
+ else
+ turn_on()
+
+ switch(href_list["operation"])
+ if("patrol")
+ auto_patrol = !auto_patrol
+ mode = BOT_IDLE
+ if("remote")
+ remote_disabled = !remote_disabled
+ if("hack")
+ if(emagged != 2)
+ emagged = 2
+ hacked = 1
+ locked = 1
+ usr << "[text_hack]"
+ bot_reset()
+ else if(!hacked)
+ usr << "[text_dehack_fail]"
+ else
+ emagged = 0
+ hacked = 0
+ usr << "[text_dehack]"
+ bot_reset()
+ updateUsrDialog()
+
+/obj/machinery/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired.
+ // 0 for access, 1 for denied.
+ if(emagged == 2) //An emagged bot cannot be controlled by humans, silicons can if one hacked it.
+ if(!hacked) //Manually emagged by a human - access denied to all.
+ return 1
+ else if(!issilicon(user)) //Bot is hacked, so only silicons are allowed access.
+ return 1
+ else
+ return 0
+
+/obj/machinery/bot/proc/bot_process() //Master process which handles code common across most bots.
+
+ set background = BACKGROUND_ENABLED
+
+ if(!on)
+ return
+
+ switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
+ if(BOT_RESPONDING) //Called by the AI.
+ call_mode()
+ return
+ if(BOT_SUMMON) //Called by PDA
+ bot_summon()
+ return
+ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early.
/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
if(!locked)
open = !open
- user << "Maintenance panel is now [src.open ? "opened" : "closed"]."
- else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
- if(health < maxhealth)
- if(open)
- health = min(maxhealth, health+10)
- user.visible_message("[user] repairs [src]!","You repair [src]!")
- else
- user << "Unable to repair with the maintenance panel closed."
+ user << "Maintenance panel is now [open ? "opened" : "closed"]."
else
- user << "[src] does not need a repair."
+ user << "Maintenance panel is locked."
else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2)
Emag(user)
else
- if(hasvar(W,"force") && hasvar(W,"damtype"))
- user.changeNext_move(CLICK_CD_MELEE)
- switch(W.damtype)
- if("fire")
- src.health -= W.force * fire_dam_coeff
- if("brute")
- src.health -= W.force * brute_dam_coeff
- ..()
- healthcheck()
+ 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."
+ return
+ if(!open)
+ 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]!")
+ else
+ 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
+ s.set_up(5, 1, src)
+ switch(W.damtype)
+ if("fire")
+ health -= W.force * fire_dam_coeff
+ s.start()
+ if("brute")
+ health -= W.force * brute_dam_coeff
+ s.start()
+ ..()
+ healthcheck()
+
/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
health -= Proj.damage
+ if(prob(75) && Proj.damage > 0)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
..()
healthcheck()
return
/obj/machinery/bot/blob_act()
- src.health -= rand(20,40)*fire_dam_coeff
+ health -= rand(20,40)*fire_dam_coeff
healthcheck()
return
/obj/machinery/bot/ex_act(severity)
switch(severity)
if(1.0)
- src.explode()
+ explode()
return
if(2.0)
- src.health -= rand(5,10)*fire_dam_coeff
- src.health -= rand(10,20)*brute_dam_coeff
+ health -= rand(5,10)*fire_dam_coeff
+ health -= rand(10,20)*brute_dam_coeff
healthcheck()
return
if(3.0)
if (prob(50))
- src.health -= rand(1,5)*fire_dam_coeff
- src.health -= rand(1,5)*brute_dam_coeff
+ health -= rand(1,5)*fire_dam_coeff
+ health -= rand(1,5)*brute_dam_coeff
healthcheck()
return
return
@@ -137,7 +305,7 @@
/obj/machinery/bot/emp_act(severity)
var/was_on = on
stat |= EMPED
- var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
@@ -155,18 +323,468 @@
/obj/machinery/bot/proc/hack(mob/user)
var/hack
- if(issilicon(user))
- hack += "[src.emagged ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" - hack += "Harm Prevention Safety System: [src.emagged ? "DANGER" : "Engaged"]
" + if(issilicon(user)) //Allows silicons to toggle the emag status of a bot. + hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" + hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" + else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. + hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" return hack -/obj/machinery/bot/attack_ai(mob/user as mob) - src.attack_hand(user) +/obj/machinery/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally. + text_hack = "You hack [name]." + text_dehack = "You reset [name]." + text_dehack_fail = "You fail to reset [name]." -/obj/machinery/bot/proc/speak(var/message) - if((!src.on) || (!message)) +/obj/machinery/bot/attack_ai(mob/user as mob) + attack_hand(user) + +/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. + if((!on) || (!message)) return - for(var/mob/O in hearers(src, null)) - O.show_message("[src] beeps, \"[message]\"",2) + if(freq) + Radio.set_frequency(radio_frequency) + Radio.talk_into(src, message, radio_frequency) + else + say(message) return + //Generalized behavior code, override where needed! + +/* +scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result. +Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists, +and the view range, which defaults to 7 (full screen) if an override is not passed. +If the bot maintains an ignore list, it is also checked here. + +Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) +The proc would return a human next to the bot to be set to the patient var. +Pass the desired type path itself, declaring a temporary var beforehand is not required. +*/ +obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range) + var/final_result + for (var/scan in view (scan_range ? scan_range : DEFAULT_SCAN_RANGE, src) ) //Search for something in range! + if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! + continue //If not, keep searching! + if( !(scan in ignore_list) && !(scan in old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. + if( scan_result ) + final_result = scan_result + else + continue //The current element failed assessment, move on to the next. + return final_result + +//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. +obj/machinery/bot/proc/process_scan(var/scan_target) + return scan_target + + +/obj/machinery/bot/proc/add_to_ignore(var/subject) + if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. + ignore_list |= subject + else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. + ignore_list -= ignore_list[1] + ignore_list |= subject + +/* +Movement proc for stepping a bot through a path generated through A-star. +Pass a positive integer as an argument to override a bot's default speed. +*/ +obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) + + if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. + path = list() + return 0 + if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again. + return 1 + var/success + var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var. + if(step_count >= 1 && tries < 4) + for(step_count, step_count >= 1,step_count--) + success = bot_step(dest) + if (success) + tries = 0 + else + tries++ + break + sleep(4) + else + return 0 + return 1 + + +obj/machinery/bot/proc/bot_step(var/dest) + if(path && path.len > 1) + step_to(src, path[1]) + if(get_turf(src) == path[1]) //Successful move + path -= path[1] + else + return 0 + else if(path.len == 1) + step_to(src, dest) + path = list() + return 1 + + +/obj/machinery/bot/proc/check_bot_access() + if(mode != BOT_SUMMON && mode != BOT_RESPONDING) + botcard.access = prev_access + +/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint) + bot_reset() //Reset a bot before setting it to call mode. + var/area/end_area = get_area(waypoint) + + //For giving the bot temporary all-access. + var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id + var/datum/job/captain/All = new/datum/job/captain + all_access.access = All.get_access() + + path = AStar(src, waypoint, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 200, id=all_access) + calling_ai = caller //Link the AI to the bot! + ai_waypoint = waypoint + + if(path && path.len) //Ensures that a valid path is calculated! + if(!on) + turn_on() //Saves the AI the hassle of having to activate a bot manually. + botcard = all_access //Give the bot all-access while under the AI's command. + calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." + pathset = 1 + mode = BOT_RESPONDING + tries = 0 + else + calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." + calling_ai = null + path = list() + +/obj/machinery/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. +//Handles the bot's movement during a call. + var/success = bot_move(ai_waypoint, 3) + if (!success) + if(calling_ai) + calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" + calling_ai = null + bot_reset() + +obj/machinery/bot/proc/bot_reset() + if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. + calling_ai << "Call command to a bot has been reset." + calling_ai = null + path = list() + summon_target = null + pathset = 0 + botcard.access = prev_access + tries = 0 + mode = BOT_IDLE + + + + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//Patrol and summon code! +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +/obj/machinery/bot/proc/bot_patrol() + patrol_step() + spawn(5) + if(mode == BOT_PATROL) + patrol_step() + return + +obj/machinery/bot/proc/start_patrol() + + if(tries >= 4) //Bot is trapped, so stop trying to patrol. + auto_patrol = 0 + tries = 0 + speak("Unable to start patrol.") + + return + + if(!auto_patrol) //A bot not set to patrol should not be patrolling. + mode = BOT_IDLE + return + + if(patrol_target) // has patrol target + spawn(0) + calc_path() // Find a route to it + if(path.len == 0) + patrol_target = 0 + return + mode = BOT_PATROL + else // no patrol target, so need a new one + find_patrol_target() + speak("Engaging patrol mode.") + tries++ + return + +// perform a single patrol step + +/obj/machinery/bot/proc/patrol_step() + + if(loc == patrol_target) // reached target + + at_patrol_target() + return + + else if(path.len > 0 && patrol_target) // valid path + var/turf/next = path[1] + if(next == loc) + path -= next + return + + + var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move + if(moved) // successful move + blockcount = 0 + + else // failed to move + blockcount++ + + if(blockcount > 5) // attempt 5 times before recomputing + // find new path excluding blocked turf + + spawn(2) + calc_path(next) + if(path.len == 0) + find_patrol_target() + else + blockcount = 0 + tries = 0 + + return + + return + + else // no path, so calculate new one + mode = BOT_START_PATROL + + return + +// finds a new patrol target +/obj/machinery/bot/proc/find_patrol_target() + send_status() + if(awaiting_beacon) // awaiting beacon response + awaiting_beacon++ + if(awaiting_beacon > 5) // wait 5 secs for beacon response + find_nearest_beacon() // then go to nearest instead + return + if(next_destination) + set_destination(next_destination) + else + + find_nearest_beacon() + return + + +// finds the nearest beacon to self +// signals all beacons matching the patrol code +/obj/machinery/bot/proc/find_nearest_beacon() + nearest_beacon = null + new_destination = "__nearest__" + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + spawn(10) + awaiting_beacon = 0 + if(nearest_beacon) + set_destination(nearest_beacon) + tries = 0 + else + auto_patrol = 0 + mode = BOT_IDLE + speak("Disengaging patrol mode.") + send_status() + + +/obj/machinery/bot/proc/at_patrol_target() + + find_patrol_target() + return + + +// sets the current destination +// signals all beacons matching the patrol code +// beacons will return a signal giving their locations +/obj/machinery/bot/proc/set_destination(var/new_dest) + new_destination = new_dest + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + + +// receive a radio signal +// used for beacon reception + +/obj/machinery/bot/receive_signal(datum/signal/signal) + //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])") + if(!on) + return +/* + if(!signal.data["beacon"]) + + for(var/x in signal.data) + world << "* [x] = [signal.data[x]]" + */ + + var/recv = signal.data["command"] + // process all-bot input + + if(recv=="bot_status") + send_status() + + // check to see if we are the commanded bot + if(signal.data["active"] == src) + if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. + return + // process control input + switch(recv) + if("stop") + bot_reset() //HOLD IT!! + auto_patrol = 0 + return + + if("go") + auto_patrol = 1 + return + + if("summon") + bot_reset() + var/list/user_access = signal.data["useraccess"] + summon_target = signal.data["target"] //Location of the user + if(user_access.len != 0) + botcard.access = user_access + prev_access //Adds the user's access, if any. + mode = BOT_SUMMON + calc_summon_path() + speak("Responding.", radio_frequency) + return + + // receive response from beacon + recv = signal.data["beacon"] + var/valid = signal.data["patrol"] + if(!recv || !valid) + return + if(recv == new_destination) // if the recvd beacon location matches the set destination + // the we will navigate there + destination = new_destination + patrol_target = signal.source.loc + next_destination = signal.data["next_patrol"] + awaiting_beacon = 0 + + // if looking for nearest beacon + else if(new_destination == "__nearest__") + var/dist = get_dist(src,signal.source.loc) + if(nearest_beacon) + // note we ignore the beacon we are located at + if(dist>1 && dist 1)
+ nearest_beacon = recv
+ nearest_beacon_loc = signal.source.loc
+ return
+
+
+// send a radio signal with a single data key/value pair
+/obj/machinery/bot/proc/post_signal(var/freq, var/key, var/value)
+ post_signal_multiple(freq, list("[key]" = value) )
+
+// send a radio signal with multiple data key/values
+/obj/machinery/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
+ if(!z || z != 1) //Bot control will only work on station.
+ return
+ var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
+
+ if(!frequency) return
+
+ var/datum/signal/signal = new()
+ signal.source = src
+ signal.transmission_method = 1
+// for(var/key in keyval)
+// signal.data[key] = keyval[key]
+ signal.data = keyval
+// world << "sent [key],[keyval[key]] on [freq]"
+ if(signal.data["findbeacon"])
+ frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
+ else if(signal.data["type"] == bot_type)
+ frequency.post_signal(src, signal, filter = bot_filter)
+ else
+ frequency.post_signal(src, signal)
+
+// signals bot status etc. to controller
+/obj/machinery/bot/proc/send_status()
+ if(remote_disabled || emagged == 2)
+ return
+ var/list/kv = list(
+ "type" = bot_type,
+ "name" = name,
+ "loca" = get_area(src), // area
+ "mode" = mode
+ )
+ post_signal_multiple(control_freq, kv)
+
+
+obj/machinery/bot/proc/bot_summon()
+ // summoned to PDA
+ summon_step()
+ return
+
+// calculates a path to the current destination
+// given an optional turf to avoid
+/obj/machinery/bot/proc/calc_path(var/turf/avoid)
+ check_bot_access()
+ path = AStar(loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
+ if(!path)
+ path = list()
+
+/obj/machinery/bot/proc/calc_summon_path(var/turf/avoid)
+ check_bot_access()
+ path = AStar(loc, summon_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid)
+ if(!path || tries >= 5) //Cannot reach target. Give up and announce the issue.
+ speak("Summon command failed, destination unreachable.",radio_frequency)
+ bot_reset()
+
+/obj/machinery/bot/proc/summon_step()
+
+ if(loc == summon_target) // Arrived to summon location.
+ bot_reset()
+ return
+
+ else if(path.len > 0 && summon_target) //Proper path acquired!
+ var/turf/next = path[1]
+ if(next == loc)
+ path -= next
+ return
+
+ var/moved = bot_move(summon_target, 3) // Move attempt
+ if(moved)
+ blockcount = 0
+
+ else // failed to move
+ blockcount++
+
+ if(blockcount > 5) // attempt 5 times before recomputing
+ // find new path excluding blocked turf
+ spawn(2)
+ calc_summon_path(next)
+ tries++
+ return
+
+ return
+
+ else // no path, so calculate new one
+ calc_summon_path()
+
+ return
+
+
+/obj/machinery/bot/Bump(M as mob|obj) //Leave no door unopened!
+ if((istype(M, /obj/machinery/door/airlock) || istype(M, /obj/machinery/door/window)) && (!isnull(botcard)))
+ var/obj/machinery/door/D = M
+ if(D.check_access(botcard))
+ D.open()
+ frustration = 0
+ else if((istype(M, /mob/living/)) && (!anchored))
+ var/mob/living/Mb = M
+ loc = Mb.loc
+ frustration = 0
+ return
\ No newline at end of file
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index 0c450b84b9c..11433562f69 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -24,51 +24,57 @@
//weight = 1.0E7
health = 25
maxhealth = 25
- var/cleaning = 0
var/blood = 1
var/list/target_types = list()
var/obj/effect/decal/cleanable/target
var/obj/effect/decal/cleanable/oldtarget
+ var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
var/oldloc = null
- req_access = list(access_janitor)
- var/path[] = new()
- var/patrol_path[] = null
- var/beacon_freq = 1445 // navigation beacon frequency
+ req_one_access = list(access_janitor, access_robotics)
+// var/patrol_path[] = null
+// var/beacon_freq = 1445 // navigation beacon frequency
var/closest_dist
var/closest_loc
var/failed_steps
- var/should_patrol
var/next_dest
var/next_dest_loc
+ radio_frequency = SERV_FREQ //Service
+ bot_type = CLEAN_BOT
+ bot_filter = RADIO_CLEANBOT
/obj/machinery/bot/cleanbot/New()
..()
- src.get_targets()
- src.icon_state = "cleanbot[src.on]"
+ get_targets()
+ icon_state = "cleanbot[on]"
- should_patrol = 1
-
- src.botcard = new /obj/item/weapon/card/id(src)
var/datum/job/janitor/J = new/datum/job/janitor
- src.botcard.access = J.get_access()
-
- if(radio_controller)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+ spawn(5)
+ add_to_beacons(bot_filter)
/obj/machinery/bot/cleanbot/turn_on()
- . = ..()
- src.icon_state = "cleanbot[src.on]"
- src.updateUsrDialog()
+ ..()
+ icon_state = "cleanbot[on]"
+ updateUsrDialog()
/obj/machinery/bot/cleanbot/turn_off()
..()
- src.target = null
- src.oldtarget = null
- src.oldloc = null
- src.icon_state = "cleanbot[src.on]"
- src.path = new()
- src.updateUsrDialog()
+ icon_state = "cleanbot[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/cleanbot/bot_reset()
+ ..()
+ ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
+ target = null
+ oldtarget = null
+ oldloc = null
+
+/obj/machinery/bot/cleanbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s cleaning software."
+ text_dehack = "[name]'s software has been reset!"
+ text_dehack_fail = "[name] does not seem to respond to your repair code!"
/obj/machinery/bot/cleanbot/attack_hand(mob/user as mob)
. = ..()
@@ -81,76 +87,39 @@
var/dat
dat += hack(user)
dat += text({"
-Automatic Station Cleaner v1.0
+Cleaner v1.1 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]"}, -text("[src.on ? "On" : "Off"]")) - if(!src.locked || issilicon(user)) - dat += text({"
Cleans Blood: []
"}, text("[src.blood ? "Yes" : "No"]")) - dat += text({"
Patrol station: []
"}, text("[src.should_patrol ? "Yes" : "No"]")) - // dat += text({"
Beacon frequency: []
"}, text("[src.beacon_freq]")) -/* if(src.open && !src.locked) - dat += text({" -Odd looking screw twiddled: []
-Weird button pressed: []"}, -text("[src.screwloose ? "Yes" : "No"]"), -text("[src.oddbutton ? "Yes" : "No"]"))*/ +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, +text("[on ? "On" : "Off"]")) + if(!locked || issilicon(user)) + dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]")) + dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]")) - user << browse("Cleaner v1.0 controls [dat]", "window=autocleaner")
- onclose(user, "autocleaner")
+ var/datum/browser/popup = new(user, "autoclean", "Automatic Station Cleaner v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/cleanbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
+
+ ..()
switch(href_list["operation"])
- if("start")
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
if("blood")
- src.blood =!src.blood
- src.get_targets()
- src.updateUsrDialog()
- if("patrol")
- src.should_patrol =!src.should_patrol
- src.patrol_path = null
- src.updateUsrDialog()
+ blood =!blood
+ get_targets()
+ updateUsrDialog()
if("freq")
var/freq = text2num(input("Select frequency for navigation beacons", "Frequency", num2text(beacon_freq / 10))) * 10
if (freq > 0)
- src.beacon_freq = freq
- src.updateUsrDialog()
-/* if("screw")
- src.screwloose = !src.screwloose
- usr << ""
- src.updateUsrDialog() */
- if("hack")
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s cleaning software."
- else if(!src.hacked)
- usr << "[src] does not seem to respond to your repair code!"
- else
- src.hacked = 0
- src.emagged = 0
- usr << "[src]'s software has been reset!"
- src.updateUsrDialog()
+ beacon_freq = freq
+ updateUsrDialog()
/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob)
if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if(src.allowed(usr) && !open && !emagged)
- src.locked = !src.locked
- user << "You [ src.locked ? "lock" : "unlock"] the [src] behaviour controls."
+ if(allowed(usr) && !open && !emagged)
+ locked = !locked
+ user << "You [ locked ? "lock" : "unlock"] the [src] behaviour controls."
else
if(emagged)
user << "ERROR"
@@ -163,135 +132,77 @@ text("[src.oddbutton ? "Yes" : "No"
/obj/machinery/bot/cleanbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "[src] buzzes and beeps."
- src.emagged = 2
+ if(emagged == 2)
+ if(user)
+ user << "[src] buzzes and beeps."
-/obj/machinery/bot/cleanbot/process()
- set background = BACKGROUND_ENABLED
+/obj/machinery/bot/cleanbot/process_scan(var/obj/effect/decal/cleanable/D)
+ for(var/T in target_types)
+ if(istype(D, T))
+ return D
- if(!src.on)
+/obj/machinery/bot/cleanbot/bot_process()
+ if (!..())
return
- if(src.cleaning)
- return
- var/list/cleanbottargets = list()
- if(!src.emagged && prob(5))
+ if(mode == BOT_CLEANING)
+ return
+
+ if(emagged == 2) //Emag functions
+ if(istype(loc,/turf/simulated))
+
+ if(prob(10)) //Wets floors randomly
+ var/turf/simulated/T = loc
+ T.MakeSlippery()
+
+ if(prob(5)) //Spawns foam!
+ visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
+ new /obj/effect/effect/foam(loc)
+
+ else if (prob(5))
visible_message("[src] makes an excited beeping booping sound!")
- if(src.emagged && prob(10)) //Wets floors randomly
- if(istype(loc,/turf/simulated))
- var/turf/simulated/T = src.loc
- T.MakeSlippery()
+ if(!target) //Search for cleanables it can see.
+ target = scan(/obj/effect/decal/cleanable/, oldtarget)
+ oldtarget = target
- if(src.emagged && prob(5)) //Spawns foam!
- visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- new /obj/effect/effect/foam(src.loc)
+ if(!target)
+ if(loc != oldloc)
+ oldtarget = null
- if(!src.target || src.target == null)
- for (var/obj/effect/decal/cleanable/D in view(7,src))
- for(var/T in src.target_types)
- if(!(D in cleanbottargets) && (D.type == T || D.parent_type == T) && D != src.oldtarget)
- src.oldtarget = D
- src.target = D
- return
+ if(auto_patrol)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
- if(!src.target || src.target == null)
- if(src.loc != src.oldloc)
- src.oldtarget = null
+ if(mode == BOT_PATROL)
+ bot_patrol()
- if (!should_patrol)
+ return
+
+ if(target)
+ if(!path || path.len == 0) //No path, need a new one
+ //Try to produce a path to the target, and ignore airlocks to which it has access.
+ path = AStar(loc, target.loc, /turf/proc/AdjacentTurfsWithAccess, /turf/proc/Distance, 0, 30, id=botcard)
+ if (!bot_move(target))
+ add_to_ignore(target)
+ target = null
+ path = list()
+ return
+ mode = BOT_MOVING
+ else if (!bot_move(target))
+ target = null
+ mode = BOT_IDLE
return
- if (!patrol_path || patrol_path.len < 1)
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(beacon_freq)
+ if(target && loc == target.loc)
+ clean(target)
+ path = list()
+ target = null
- if(!frequency) return
-
- closest_dist = 9999
- closest_loc = null
- next_dest_loc = null
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- signal.data = list("findbeacon" = "patrol")
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- spawn(5)
- if (!next_dest_loc)
- next_dest_loc = closest_loc
- if (next_dest_loc)
- src.patrol_path = AStar(src.loc, next_dest_loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=null)
- if(!patrol_path)
- patrol_path = list()
- else
- patrol_move()
-
- return
-
- if(target && path.len == 0)
- spawn(0)
- if(!src || !target) return
- src.path = AStar(src.loc, src.target.loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldtarget = src.target
- src.target = null
- return
- if(src.path.len > 0 && src.target && (src.target != null))
- step_to(src, src.path[1])
- src.path -= src.path[1]
- else if(src.path.len == 1)
- step_to(src, target)
-
- if(src.target && (src.target != null))
- patrol_path = null
- if(src.loc == src.target.loc)
- clean(src.target)
- src.path = new()
- src.target = null
- return
-
- src.oldloc = src.loc
-
-/obj/machinery/bot/cleanbot/proc/patrol_move()
- if (src.patrol_path.len <= 0)
- return
-
- var/next = src.patrol_path[1]
- src.patrol_path -= next
- if (next == src.loc)
- return
-
- var/moved = step_towards(src, next)
- if (!moved)
- failed_steps++
- if (failed_steps > 4)
- patrol_path = null
- next_dest = null
- failed_steps = 0
- else
- failed_steps = 0
-
-/obj/machinery/bot/cleanbot/receive_signal(datum/signal/signal)
- var/recv = signal.data["beacon"]
- var/valid = signal.data["patrol"]
- if(!recv || !valid)
- return
-
- var/dist = get_dist(src, signal.source.loc)
- if (dist < closest_dist && signal.source.loc != src.loc)
- closest_dist = dist
- closest_loc = signal.source.loc
- next_dest = signal.data["next_patrol"]
-
- if (recv == next_dest)
- next_dest_loc = signal.source.loc
- next_dest = signal.data["next_patrol"]
+ oldloc = loc
/obj/machinery/bot/cleanbot/proc/get_targets()
- src.target_types = new/list()
+ target_types = new/list()
target_types += /obj/effect/decal/cleanable/oil
target_types += /obj/effect/decal/cleanable/vomit
@@ -306,7 +217,7 @@ text("[src.oddbutton ? "Yes" : "No"
target_types += /obj/effect/decal/cleanable/greenglow
target_types += /obj/effect/decal/cleanable/dirt
- if(src.blood)
+ if(blood)
target_types += /obj/effect/decal/cleanable/xenoblood/
target_types += /obj/effect/decal/cleanable/xenoblood/xgibs
target_types += /obj/effect/decal/cleanable/blood/
@@ -314,20 +225,21 @@ text("[src.oddbutton ? "Yes" : "No"
target_types += /obj/effect/decal/cleanable/trail_holder
/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
- src.anchored = 1
- src.icon_state = "cleanbot-c"
- visible_message("[src] begins to clean up [target]")
- src.cleaning = 1
+ anchored = 1
+ icon_state = "cleanbot-c"
+ visible_message("[src] begins to clean up [target]")
+ mode = BOT_CLEANING
spawn(50)
- src.cleaning = 0
- qdel(target)
- src.icon_state = "cleanbot[src.on]"
- src.anchored = 0
- src.target = null
+ if(mode == BOT_CLEANING)
+ qdel(target)
+ anchored = 0
+ target = null
+ mode = BOT_IDLE
+ icon_state = "cleanbot[on]"
/obj/machinery/bot/cleanbot/explode()
- src.on = 0
- src.visible_message("[src] blows apart!")
+ on = 0
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
@@ -348,9 +260,9 @@ text("[src.oddbutton ? "Yes" : "No"
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
user.drop_item()
qdel(W)
- var/turf/T = get_turf(src.loc)
+ var/turf/T = get_turf(loc)
var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
- A.name = src.created_name
+ A.name = created_name
user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
user.unEquip(src, 1)
qdel(src)
@@ -359,6 +271,6 @@ text("[src.oddbutton ? "Yes" : "No"
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index ec97fbd8012..93652a4f4b6 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -25,46 +25,25 @@
var/threatlevel = 0
var/target_lastloc //Loc of target when arrested.
var/last_found //There's a delay
- var/frustration = 0
//var/emagged = 0 //Emagged Secbots view everyone as a criminal
var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds?
var/idcheck = 1 //If true, arrest people with no IDs
var/weaponscheck = 1 //If true, arrest people for weapons if they don't have access
var/check_records = 1 //Does it check security records?
var/arrest_type = 0 //If true, don't handcuff
- var/projectile = null//Holder for projectile type, to avoid so many else if chains
-
- var/mode = 0
-#define SECBOT_IDLE 0 // idle
-#define SECBOT_HUNT 1 // found target, hunting
-#define SECBOT_PREP_ARREST 2 // at target, preparing to arrest
-#define SECBOT_ARREST 3 // arresting target
-#define SECBOT_START_PATROL 4 // start patrol
-#define SECBOT_PATROL 5 // patrolling
-#define SECBOT_SUMMON 6 // summoned by PDA
-
- var/auto_patrol = 0 // set to make bot automatically patrol
-
- var/beacon_freq = 1445 // navigation beacon frequency
- var/control_freq = 1447 // bot control frequency
+ var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
+ var/shoot_sound = 'sound/weapons/Taser.ogg'
+ radio_frequency = SEC_FREQ
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
//List of weapons that secbots will not arrest for
var/safe_weapons = list(\
/obj/item/weapon/gun/energy/laser/bluetag,\
/obj/item/weapon/gun/energy/laser/redtag,\
- /obj/item/weapon/gun/energy/laser/practice)
-
- var/turf/patrol_target // this is turf to navigate to (location of beacon)
- var/new_destination // pending new destination (waiting for beacon response)
- var/destination // destination description tag
- var/next_destination // the next destination in the patrol route
- var/list/path = new // list of path turfs
-
- var/blockcount = 0 //number of times retried a blocked path
- var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
-
- var/nearest_beacon // the nearest beacon's tag
- var/turf/nearest_beacon_loc // the nearest beacon's location
+ /obj/item/weapon/gun/energy/laser/practice,\
+ /obj/item/weapon/melee/telebaton,\
+ /obj/item/weapon/gun/energy/kinetic_accelerator)
/obj/item/weapon/ed209_assembly
@@ -80,43 +59,54 @@
/obj/machinery/bot/ed209/New(loc,created_name,created_lasercolor)
..()
- if(created_name) name = created_name
- if(created_lasercolor) lasercolor = created_lasercolor
- src.icon_state = "[lasercolor]ed209[src.on]"
+ if(created_name)
+ name = created_name
+ if(created_lasercolor)
+ lasercolor = created_lasercolor
+ icon_state = "[lasercolor]ed209[on]"
+ set_weapon() //giving it the right projectile and firing sound.
spawn(3)
- src.botcard = new /obj/item/weapon/card/id(src)
var/datum/job/detective/J = new/datum/job/detective
- src.botcard.access = J.get_access()
+ botcard.access = J.get_access()
+ prev_access = botcard.access
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+
+ add_to_beacons(bot_filter)
if(lasercolor)
shot_delay = 6//Longer shot delay because JESUS CHRIST
check_records = 0//Don't actively target people set to arrest
arrest_type = 1//Don't even try to cuff
req_access = list(access_maint_tunnels, access_theatre)
arrest_type = 1
- if((lasercolor == "b") && (name == "ED-209 Security Robot"))//Picks a name if there isn't already a custome one
+ if((lasercolor == "b") && (name == "\improper ED-209 Security Robot"))//Picks a name if there isn't already a custome one
name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
- if((lasercolor == "r") && (name == "ED-209 Security Robot"))
+ if((lasercolor == "r") && (name == "\improper ED-209 Security Robot"))
name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
/obj/machinery/bot/ed209/turn_on()
. = ..()
- src.icon_state = "[lasercolor]ed209[src.on]"
- src.mode = SECBOT_IDLE
- src.updateUsrDialog()
+ icon_state = "[lasercolor]ed209[on]"
+ mode = BOT_IDLE
+ updateUsrDialog()
/obj/machinery/bot/ed209/turn_off()
..()
- src.target = null
- src.oldtarget_name = null
- src.anchored = 0
- src.mode = SECBOT_IDLE
+ icon_state = "[lasercolor]ed209[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/ed209/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
walk_to(src,0)
- src.icon_state = "[lasercolor]ed209[src.on]"
- src.updateUsrDialog()
+ last_found = world.time
+ set_weapon()
+
+/obj/machinery/bot/ed209/set_custom_texts()
+ text_hack = "You disable [name]'s combat inhibitor."
+ text_dehack = "You restore [name]'s combat inhibitor."
+ text_dehack_fail = "[name] ignores your attempts to restrict him!"
/obj/machinery/bot/ed209/attack_hand(mob/user as mob)
. = ..()
@@ -125,13 +115,14 @@
var/dat
dat += hack(user)
dat += text({"
+Security Unit v2.6 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]
"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) if(!lasercolor) dat += text({"
Arrest Unidentifiable Persons: []
@@ -140,76 +131,49 @@ Arrest for Warrant: []
Operating Mode: []
Report Arrests[]
-Auto Patrol: []"}, +Auto Patrol[]"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - - var/datum/browser/popup = new(user, "autosec", "Securitron v2.0.9 controls") + var/datum/browser/popup = new(user, "autoed209", "Automatic Security Unit v2.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/ed209/Topic(href, href_list) - if (..()) - return - usr.set_machine(src) - src.add_fingerprint(usr) if(lasercolor && (istype(usr,/mob/living/carbon/human))) var/mob/living/carbon/human/H = usr if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it return else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) return - if ((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + ..() switch(href_list["operation"]) if ("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() - if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() - if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + weaponscheck = !weaponscheck + updateUsrDialog() + if ("ignorerec") + check_records = !check_records + updateUsrDialog() + if ("switchmode") + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You disable [src]'s combat inhibitor." - else if(!src.hacked) - usr << "[src] ignores your attempts to restrict it!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You restore [src]'s combat inhibitor." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() /obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked" : "unlocked"]." + if (allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked" : "unlocked"]." else if(emagged) user << "ERROR" @@ -219,92 +183,79 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. - if(hasvar(W,"force") && W.force)//If force is defined and non-zero + if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. + return + if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user + target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + shootAt(user) + mode = BOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "[lasercolor]ed209[src.on]" - src.projectile = null - mode = SECBOT_IDLE + if(emagged == 2) + if(user) + user << "You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "[lasercolor]ed209[on]" + set_weapon() -/obj/machinery/bot/ed209/process() - set background = BACKGROUND_ENABLED - - if (!src.on || src.disabled) +/obj/machinery/bot/ed209/bot_process() + if (!..()) return + + if(disabled) + return + var/list/targets = list() - for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(7,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue - if (istype(C, /mob/living/carbon/human)) - threatlevel = C.assess_threat(src, lasercolor) - //src.speak(C.real_name + text(": threat: []", threatlevel)) + threatlevel = C.assess_threat(src, lasercolor) + //speak(C.real_name + text(": threat: []", threatlevel)) if (threatlevel < 4 ) continue var/dst = get_dist(src, C) - if ( dst <= 1 || dst > 12) + if ( dst <= 1 || dst > 7) continue targets += C if (targets.len>0) - var/mob/t = pick(targets) - if (istype(t, /mob/living)) - if ((t.stat!=2) && (t.lying != 1)) - //src.speak("selected target: " + t.real_name) - src.shootAt(t) + var/mob/living/carbon/t = pick(targets) + if ((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. + shootAt(t) switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - look_for_perp() // see if any criminals are in range + if(!lasercolor) //lasertag bots don't want to arrest anyone + look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp - if(src.lasercolor)//Lasertag bots do not tase or arrest anyone, just patrol and shoot and whatnot - mode = SECBOT_IDLE - return + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if (src.frustration >= 8) - // for(var/mob/O in hearers(src, null)) - // O << "[src] beeps, \"Backup requested! Suspect has evaded arrest.\"" - src.target = null - src.last_found = world.time - src.frustration = 0 - src.mode = 0 + if (frustration >= 8) walk_to(src,0) + back_to_idle() - if (target) // make sure target exists - if (get_dist(src, src.target) <= 1) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "[lasercolor]ed209-c" + if(target) // make sure target exists + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "[lasercolor]ed209-c" spawn(2) - src.icon_state = "[lasercolor]ed209[src.on]" - var/mob/living/carbon/M = src.target - var/maxstuns = 4 - if (istype(M, /mob/living/carbon/human)) - if (M.stuttering < 5 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + icon_state = "[lasercolor]ed209[on]" + var/mob/living/carbon/M = target + if(istype(M, /mob/living/carbon/human)) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 M.Stun(5) M.Weaken(5) @@ -315,374 +266,128 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - maxstuns-- - if(maxstuns <= 0) - target = null - - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if ((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if ((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 + else + back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target - if(src.lasercolor) - mode = SECBOT_IDLE - return - if (!target) - mode = SECBOT_IDLE - src.anchored = 0 - return - // see if he got away - if ((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) - src.anchored = 0 - mode = SECBOT_HUNT + if(BOT_PREP_ARREST) // preparing to arrest target + + // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) + back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if (!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) - mode = SECBOT_ARREST - target.visible_message("[src] is trying to put handcuffs on [src.target]!",\ - "[src] is trying to put handcuffs on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + 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]!") - spawn(60) - if (get_dist(src, src.target) <= 1) - if (src.target.handcuffed) + spawn(60) + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - - if(istype(src.target,/mob/living/carbon)) - src.target.handcuffed = new /obj/item/weapon/restraints/handcuffs(src.target) - target.update_inv_handcuffed(0) //update handcuff overlays - - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) - else - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - if(SECBOT_ARREST) // arresting - if(src.lasercolor) - mode = SECBOT_IDLE - return - if (!target || src.target.handcuffed) - src.anchored = 0 - mode = SECBOT_IDLE - return - - - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 + if(!target.handcuffed) + target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) + target.update_inv_handcuffed(0) //update the handcuffs overlay + back_to_idle() + else + back_to_idle() return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() - - return - - -// perform a single patrol step - -/obj/machinery/bot/ed209/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - if(lasercolor) - sleep(20) - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - + else + back_to_idle() return - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/ed209/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/ed209/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/ed209/proc/at_patrol_target() - find_patrol_target() - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/ed209/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/ed209/receive_signal(datum/signal/signal) - - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 + if(BOT_ARREST) + if (!target) + anchored = 0 + mode = BOT_IDLE + last_found = world.time + frustration = 0 return - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 + if(target.handcuffed) //no target or target cuffed? back to idle. + back_to_idle() return - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist 1)
- nearest_beacon = recv
- nearest_beacon_loc = signal.source.loc
+ mode = BOT_PREP_ARREST
+ anchored = 0
+
+ if(BOT_START_PATROL)
+ look_for_perp()
+ start_patrol()
+
+ if(BOT_PATROL)
+ look_for_perp()
+ bot_patrol()
+
+
return
+/obj/machinery/bot/ed209/proc/back_to_idle()
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ last_found = world.time
+ frustration = 0
+ spawn(0)
+ bot_process() //ensure bot quickly responds
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/ed209/proc/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/ed209/proc/post_signal_multiple(var/freq, var/list/keyval)
-
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- //for(var/key in keyval)
- // signal.data[key] = keyval[key]
- //world << "sent [key],[keyval[key]] on [freq]"
- signal.data = keyval
- if (signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if (signal.data["type"] == "secbot")
- frequency.post_signal(src, signal, filter = RADIO_SECBOT)
- else
- frequency.post_signal(src, signal)
-
-// signals bot status etc. to controller
-/obj/machinery/bot/ed209/proc/send_status()
- var/list/kv = list(
- "type" = "secbot",
- "name" = name,
- "loca" = loc.loc, // area
- "mode" = mode,
- )
- post_signal_multiple(control_freq, kv)
-
-
-
-// calculates a path to the current destination
-// given an optional turf to avoid
-/obj/machinery/bot/ed209/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
-
+/obj/machinery/bot/ed209/proc/back_to_hunt()
+ anchored = 0
+ frustration = 0
+ mode = BOT_HUNT
+ spawn(0)
+ bot_process() //ensure bot quickly responds
// look for a criminal in view of the bot
/obj/machinery/bot/ed209/proc/look_for_perp()
- if(src.disabled)
+ if(disabled)
return
- src.anchored = 0
- src.threatlevel = 0
- for (var/mob/living/carbon/C in view(12,src)) //Let's find us a criminal
+ anchored = 0
+ threatlevel = 0
+ for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if ((C.stat) || (C.handcuffed))
continue
- if((src.lasercolor) && (C.lying))
- continue//Does not shoot at people lyind down when in lasertag mode, because it's just annoying, and they can fire once they get up.
-
- if ((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
+ if ((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- src.threatlevel = C.assess_threat(src, lasercolor)
+ threatlevel = C.assess_threat(src, lasercolor)
- if (!src.threatlevel)
+ if (!threatlevel)
continue
- else if (src.threatlevel >= 4)
- src.target = C
- src.oldtarget_name = C.name
- src.speak("Level [src.threatlevel] infraction alert!")
- if(!src.lasercolor)
- playsound(src.loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
- src.visible_message("[src] points at [C.name]!")
- mode = SECBOT_HUNT
+ else if (threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
spawn(0)
- process() // ensure bot quickly responds to a perp
+ bot_process() // ensure bot quickly responds to a perp
break
else
continue
@@ -694,14 +399,14 @@ Auto Patrol: []"},
return 0
/obj/machinery/bot/ed209/Bump(M as mob|obj) //Leave no door unopened!
- if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
+ if ((istype(M, /obj/machinery/door)) && (!isnull(botcard)))
var/obj/machinery/door/D = M
- if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
+ if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(botcard))
D.open()
- src.frustration = 0
- else if ((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
+ frustration = 0
+ else if ((istype(M, /mob/living/)) && (!anchored))
+ loc = M:loc
+ frustration = 0
return
/* terrible
@@ -714,24 +419,27 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
Sa.build_step = 1
Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
- Sa.created_name = src.name
+ Sa.created_name = name
new /obj/item/device/assembly/prox_sensor(Tsec)
if(!lasercolor)
var/obj/item/weapon/gun/energy/taser/G = new /obj/item/weapon/gun/energy/taser(Tsec)
G.power_supply.charge = 0
+ G.update_icon()
else if(lasercolor == "b")
var/obj/item/weapon/gun/energy/laser/bluetag/G = new /obj/item/weapon/gun/energy/laser/bluetag(Tsec)
G.power_supply.charge = 0
+ G.update_icon()
else if(lasercolor == "r")
var/obj/item/weapon/gun/energy/laser/redtag/G = new /obj/item/weapon/gun/energy/laser/redtag(Tsec)
G.power_supply.charge = 0
+ G.update_icon()
if (prob(50))
new /obj/item/robot_parts/l_leg(Tsec)
@@ -752,9 +460,24 @@ Auto Patrol: []"},
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
qdel(src)
+/obj/machinery/bot/ed209/proc/set_weapon() //used to update the projectile type and firing sound
+ shoot_sound = 'sound/weapons/laser.ogg'
+ if(emagged == 2)
+ if(lasercolor)
+ projectile = /obj/item/projectile/lasertag
+ else
+ projectile = /obj/item/projectile/beam
+ else
+ if(!lasercolor)
+ shoot_sound = 'sound/weapons/Taser.ogg'
+ projectile = /obj/item/projectile/energy/electrode
+ else if(lasercolor == "b")
+ projectile = /obj/item/projectile/lasertag/bluetag
+ else if(lasercolor == "r")
+ projectile = /obj/item/projectile/lasertag/redtag
/obj/machinery/bot/ed209/proc/shootAt(var/mob/target)
if(lastfired && world.time - lastfired < shot_delay)
@@ -770,30 +493,14 @@ Auto Patrol: []"},
return
//if(lastfired && world.time - lastfired < 100)
- var/shoot_sound = 'sound/weapons/laser.ogg'
if(!projectile)
- if(!lasercolor)
- if (src.emagged == 2)
- projectile = /obj/item/projectile/beam
- else
- projectile = /obj/item/projectile/energy/electrode
- shoot_sound = 'sound/weapons/Taser.ogg'
- else if(lasercolor == "b")
- if (src.emagged == 2)
- projectile = /obj/item/projectile/lasertag
- else
- projectile = /obj/item/projectile/lasertag/bluetag
- else if(lasercolor == "r")
- if (src.emagged == 2)
- projectile = /obj/item/projectile/lasertag
- else
- projectile = /obj/item/projectile/lasertag/redtag
+ return
if (!( istype(U, /turf) ))
return
var/obj/item/projectile/A = new projectile (loc)
- playsound(src.loc, shoot_sound, 50, 1)
+ playsound(loc, shoot_sound, 50, 1)
A.current = U
A.yo = U.y - T.y
A.xo = U.x - T.x
@@ -805,8 +512,8 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
if (!isalien(target))
- src.target = user
- src.mode = SECBOT_HUNT
+ target = user
+ mode = BOT_HUNT
/obj/machinery/bot/ed209/emp_act(severity)
@@ -814,7 +521,7 @@ Auto Patrol: []"},
if(severity==2 && prob(70))
..(severity-1)
else
- var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
@@ -834,16 +541,18 @@ Auto Patrol: []"},
targets-=toshoot
if (prob(50) && emagged < 2)
emagged = 2
+ set_weapon()
shootAt(toshoot)
emagged = 0
+ set_weapon()
else
shootAt(toshoot)
else if(prob(50))
if(targets.len)
var/mob/toarrest = pick(targets)
if (toarrest)
- src.target = toarrest
- src.mode = SECBOT_HUNT
+ target = toarrest
+ mode = BOT_HUNT
@@ -853,7 +562,7 @@ Auto Patrol: []"},
if(istype(W, /obj/item/weapon/pen))
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name,MAX_NAME_LEN)
if(!t) return
- if(!in_range(src, usr) && src.loc != usr) return
+ if(!in_range(src, usr) && loc != usr) return
created_name = t
return
@@ -957,14 +666,14 @@ Auto Patrol: []"},
return
build_step++
user << "You add [W] to [src]."
- src.item_state = "[lasercolor]ed209_taser"
- src.icon_state = "[lasercolor]ed209_taser"
+ item_state = "[lasercolor]ed209_taser"
+ icon_state = "[lasercolor]ed209_taser"
user.drop_item()
qdel(W)
if(8)
if(istype(W, /obj/item/weapon/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
var/turf/T = get_turf(user)
user << "Now attaching the gun to the frame..."
sleep(40)
@@ -988,18 +697,18 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = 0
- if((src.lasercolor == "b"))
+ if((lasercolor == "b"))
if(istype(Proj, /obj/item/projectile/lasertag/redtag))
lasertag_check++
- else if((src.lasercolor == "r"))
+ else if((lasercolor == "r"))
if(istype(Proj, /obj/item/projectile/lasertag/bluetag))
lasertag_check++
if(lasertag_check)
icon_state = "[lasercolor]ed2090"
- src.disabled = 1
+ disabled = 1
target = null
spawn(100)
- src.disabled = 0
+ disabled = 0
icon_state = "[lasercolor]ed2091"
return 1
else
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index d9f4c5a2ecd..06d910910d3 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -36,35 +36,64 @@
maxhealth = 25
//weight = 1.0E7
var/amount = 10
- var/repairing = 0
- var/improvefloors = 0
+ var/replacetiles = 0
var/eattiles = 0
var/maketiles = 0
+ var/fixfloors = 0
+ var/autotile = 0
+ var/nag_on_empty = 1
+ var/nagged = 0 //Prevents the Floorbot nagging more than once per refill.
+ var/max_targets = 50
var/turf/target
var/turf/oldtarget
var/oldloc = null
- req_access = list(access_construction)
- var/path[] = new()
+ req_one_access = list(access_construction, access_robotics)
var/targetdirection
-
+ radio_frequency = ENG_FREQ //Engineering channel
+ bot_type = FLOOR_BOT
+ bot_filter = RADIO_FLOORBOT
+ var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
+ #define HULL_BREACH 1
+ #define BRIDGE_MODE 2
+ #define FIX_TILE 3
+ #define AUTO_TILE 4
+ #define REPLACE_TILE 5
+ #define TILE_EMAG 6
/obj/machinery/bot/floorbot/New()
..()
- src.updateicon()
+ updateicon()
+ var/datum/job/engineer/J = new/datum/job/engineer
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+
+ spawn(5)
+ add_to_beacons(bot_filter)
/obj/machinery/bot/floorbot/turn_on()
. = ..()
- src.updateicon()
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
/obj/machinery/bot/floorbot/turn_off()
..()
- src.target = null
- src.oldtarget = null
- src.oldloc = null
- src.updateicon()
- src.path = new()
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
+
+/obj/machinery/bot/floorbot/bot_reset()
+ ..()
+ target = null
+ oldtarget = null
+ oldloc = null
+ ignore_list = list()
+ nagged = 0
+ anchored = 0
+ update_icon()
+
+/obj/machinery/bot/floorbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s construction protocols."
+ text_dehack = "You detect errors in [name] and reset his programming."
+ text_dehack_fail = "[name] is not responding to reset commands!"
/obj/machinery/bot/floorbot/attack_hand(mob/user as mob)
. = ..()
@@ -76,44 +105,51 @@
/obj/machinery/bot/floorbot/interact(mob/user as mob)
var/dat
dat += hack(user)
- dat += "Automatic Station Floor Repairer v1.0
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" - dat += "Tiles left: [src.amount]
" - dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) - dat += "Improves floors: [src.improvefloors ? "Yes" : "No"]
" - dat += "Finds tiles: [src.eattiles ? "Yes" : "No"]
" - dat += "Make singles pieces of metal into tiles when empty: [src.maketiles ? "Yes" : "No"]
" + dat += "Floor Repairer Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" + dat += "Tiles left: [amount]
" + dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) + dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" + dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
" + dat += "Finds tiles: [eattiles ? "Yes" : "No"]
" + dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" + dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" + dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode - if (src.targetdirection) - bmode = dir2text(src.targetdirection) + if (targetdirection) + bmode = dir2text(targetdirection) else - bmode = "Disabled" - dat += "
Bridge Mode : [bmode]
" + bmode = "disabled" + dat += "Bridge Mode : [bmode]
" - user << browse("Repairbot v1.0 controls [dat]", "window=autorepair")
- onclose(user, "autorepair")
+ var/datum/browser/popup = new(user, "autofloor", "Automatic Station Floor Repairer v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob)
if(istype(W, /obj/item/stack/tile/plasteel))
var/obj/item/stack/tile/plasteel/T = W
- if(src.amount >= 50)
+ if(amount >= 50)
return
- var/loaded = min(50 - src.amount, T.get_amount())
+ var/loaded = min(50-amount, T.amount)
T.use(loaded)
- src.amount += loaded
+ amount += loaded
if (loaded > 0)
- user << "You load [loaded] tiles into the floorbot. He now contains [src.amount] tiles."
- src.updateicon()
+ user << "You load [loaded] tiles into the floorbot. He now contains [amount] tiles."
+ nagged = 0
+ updateicon()
else
- user << "You need at least one floor tile to put into the floorbot."
+ 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(src.allowed(usr) && !open && !emagged)
- src.locked = !src.locked
- user << "You [src.locked ? "lock" : "unlock"] the [src] behaviour controls."
+ if(allowed(user) && !open && !emagged)
+ locked = !locked
+ user << "You [locked ? "lock" : "unlock"] \the [src] behaviour controls."
else
if(emagged)
user << "ERROR"
@@ -121,265 +157,294 @@
user << "Please close the access panel before locking it."
else
user << "Access denied."
- src.updateUsrDialog()
+ updateUsrDialog()
else
..()
/obj/machinery/bot/floorbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "The [src] buzzes and beeps."
+ if(emagged == 2)
+ if(user)
+ user << "[src] buzzes and beeps."
/obj/machinery/bot/floorbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
+ ..()
switch(href_list["operation"])
- if("start")
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
- if("improve")
- src.improvefloors = !src.improvefloors
- src.updateUsrDialog()
+ if("replace")
+ replacetiles = !replacetiles
if("tiles")
- src.eattiles = !src.eattiles
- src.updateUsrDialog()
+ eattiles = !eattiles
if("make")
- src.maketiles = !src.maketiles
- src.updateUsrDialog()
- if("hack")
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s construction protocols."
- else if(!src.hacked)
- usr << "[src] is not responding to reset commands!"
- else
- src.emagged = 0
- src.hacked = 0
- usr << "You detect errors in [src] and reset its programming."
- src.updateUsrDialog()
+ maketiles = !maketiles
+ if("fix")
+ fixfloors = !fixfloors
+ if("autotile")
+ autotile = !autotile
+ if("emptynag")
+ nag_on_empty = !nag_on_empty
+ if("anchor")
+ anchored = !anchored
+
if("bridgemode")
- switch(src.targetdirection)
- if(null)
+ var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable")
+ switch(setdir)
+ if("north")
targetdirection = 1
- if(1)
+ if("south")
targetdirection = 2
- if(2)
+ if("east")
targetdirection = 4
- if(4)
+ if("west")
targetdirection = 8
- if(8)
+ if("disable")
targetdirection = null
- else
- targetdirection = null
- src.updateUsrDialog()
+ updateUsrDialog()
-/obj/machinery/bot/floorbot/process()
- set background = BACKGROUND_ENABLED
+/obj/machinery/bot/floorbot/bot_process()
+ if (!..())
+ return
- if(!src.on)
+ if(mode == BOT_REPAIRING)
return
- if(src.repairing)
- return
- var/list/floorbottargets = list()
- if(src.amount <= 0 && ((src.target == null) || !src.target))
- if(src.eattiles)
- for(var/obj/item/stack/tile/plasteel/T in view(7, src))
- if(T != src.oldtarget && !(target in floorbottargets))
- src.oldtarget = T
- src.target = T
- break
- if(src.target == null || !src.target)
- if(src.maketiles)
- if(src.target == null || !src.target)
- for(var/obj/item/stack/sheet/metal/M in view(7, src))
- if(!(M in floorbottargets) && M != src.oldtarget && M.amount == 1 && !(istype(M.loc, /turf/simulated/wall)))
- src.oldtarget = M
- src.target = M
- break
- else
+
+ if(amount <= 0 && !target) //Out of tiles! We must refill!
+ if(eattiles) //Configured to find and consume floortiles!
+ target = scan(/obj/item/stack/tile/plasteel, oldtarget)
+ process_type = null
+
+ if(!target && maketiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
+ target = scan(/obj/item/stack/sheet/metal, oldtarget)
+ process_type = null
return
+ else
+ if(nag_on_empty) //Floorbot is empty and cannot acquire more tiles, nag the engineers for more!
+ nag()
+
if(prob(5))
visible_message("[src] makes an excited booping beeping sound!")
- if((!src.target || src.target == null) && emagged < 2)
- if(targetdirection != null)
- /*
- for (var/turf/space/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode
- if(get_dir(src, D) == targetdirection)
- src.oldtarget = D
- src.target = D
- break
- */
+ //Normal scanning procedure. We have tiles loaded, are not emagged.
+ if(!target && emagged < 2 && amount > 0)
+ if(targetdirection != null) //The bot is in bridge mode.
+ //Try to find a space tile immediately in our selected direction.
var/turf/T = get_step(src, targetdirection)
if(istype(T, /turf/space))
- src.oldtarget = T
- src.target = T
- if(!src.target || src.target == null)
- for (var/turf/space/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget && (D.loc.name != "Space"))
- src.oldtarget = D
- src.target = D
- break
- if((!src.target || src.target == null ) && src.improvefloors)
- for (var/turf/simulated/floor/F in view(7,src))
- if(!(F in floorbottargets) && F != src.oldtarget && F.icon_state == "Floor1" && !(istype(F, /turf/simulated/floor/plating)))
- src.oldtarget = F
- src.target = F
- break
- if((!src.target || src.target == null) && src.eattiles)
- for(var/obj/item/stack/tile/plasteel/T in view(7, src))
- if(!(T in floorbottargets) && T != src.oldtarget)
- src.oldtarget = T
- src.target = T
- break
+ target = T
- if((!src.target || src.target == null) && emagged == 2)
- if(!src.target || src.target == null)
- for (var/turf/simulated/floor/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget && D.floor_tile)
- src.oldtarget = D
- src.target = D
- break
+ else //Find a space tile farther way!
+ target = scan(/turf/space, oldtarget)
+ process_type = BRIDGE_MODE
- if(!src.target || src.target == null)
- if(src.loc != src.oldloc)
- src.oldtarget = null
+ if(!target)
+ process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones.
+ target = scan(/turf/space, oldtarget)
+
+ if(!target && replacetiles) //Finds a floor without a tile and gives it one.
+ process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
+ target = scan(/turf/simulated/floor, oldtarget)
+
+ if(!target && fixfloors) //Repairs damaged floors and tiles.
+ process_type = FIX_TILE
+ target = scan(/turf/simulated/floor, oldtarget)
+
+ if(!target && emagged == 2) //We are emagged! Time to rip up the floors!
+ process_type = TILE_EMAG
+ target = scan(/turf/simulated/floor, oldtarget)
+
+
+ if(!target)
+
+ if(auto_patrol)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
+
+ if(!target)
+ if(loc != oldloc)
+ oldtarget = null
return
- if(src.target && (src.target != null) && src.path.len == 0)
- spawn(0)
- if(!istype(src.target, /turf/))
+ if(target)
+ if(path.len == 0)
+ if(!istype(target, /turf/))
var/turf/TL = get_turf(target)
- src.path = AStar(src.loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
+ path = AStar(loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
else
- src.path = AStar(src.loc, src.target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldtarget = src.target
- src.target = null
- return
- if(src.path.len > 0 && src.target && (src.target != null))
- step_to(src, src.path[1])
- src.path -= src.path[1]
- else if(src.path.len == 1)
- step_to(src, target)
- src.path = new()
+ path = AStar(loc, target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
- if(src.loc == src.target || src.loc == src.target.loc)
- if(istype(src.target, /obj/item/stack/tile/plasteel))
- src.eattile(src.target)
- else if(istype(src.target, /obj/item/stack/sheet/metal))
- src.maketile(src.target)
- else if(istype(src.target, /turf/) && emagged < 2)
- repair(src.target)
- else if(emagged == 2 && istype(src.target,/turf/simulated/floor))
- var/turf/simulated/floor/F = src.target
- src.anchored = 1
- src.repairing = 1
- if(prob(90))
- F.break_tile_to_plating()
- else
- F.ReplaceWithLattice()
- visible_message("[src] makes an excited booping sound.")
- spawn(50)
- src.amount ++
- src.anchored = 0
- src.repairing = 0
- src.target = null
- src.path = new()
- return
-
- src.oldloc = src.loc
-
-
-/obj/machinery/bot/floorbot/proc/repair(var/turf/target)
- if(istype(target, /turf/space/))
- if(target.loc.name == "Space")
+ if(!bot_move(target))
+ add_to_ignore(target)
+ oldtarget = target
+ target = null
+ mode = BOT_IDLE
+ return
+ else if( !bot_move(target) )
+ oldtarget = target
+ target = null
+ mode = BOT_IDLE
return
- else if(!istype(target, /turf/simulated/floor))
- return
- if(src.amount <= 0)
- return
- src.anchored = 1
- src.icon_state = "floorbot-c"
- if(istype(target, /turf/space/))
- visible_message("[src] begins to repair the hole.")
- var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
- src.repairing = 1
- spawn(50)
- T.build(src.loc)
- src.repairing = 0
- src.amount -= 1
- src.updateicon()
- src.anchored = 0
- src.target = null
+
+ if(loc == target || loc == target.loc)
+ if(istype(target, /obj/item/stack/tile/plasteel))
+ eattile(target)
+ else if(istype(target, /obj/item/stack/sheet/metal))
+ maketile(target)
+ else if(istype(target, /turf/) && emagged < 2)
+ repair(target)
+ else if(emagged == 2 && istype(target,/turf/simulated/floor))
+ var/turf/simulated/floor/F = target
+ anchored = 1
+ mode = BOT_REPAIRING
+ if(prob(90))
+ F.break_tile_to_plating()
+ else
+ F.ReplaceWithLattice()
+ visible_message("[src] makes an excited booping sound.")
+ spawn(50)
+ amount ++
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ path = new()
+ return
+
+ oldloc = loc
+
+/obj/machinery/bot/floorbot/proc/nag() //Annoy everyone on the channel to refill us!
+ if(!nagged)
+ speak("Requesting refill at [get_area(src)]!", radio_frequency)
+ nagged = 1
+
+/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
+ var/area/t_area = get_area(t)
+ if (t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle")))
+ return 0
else
- visible_message("[src] begins to improve the floor.")
- src.repairing = 1
+ return 1
+
+//Floorbots, having several functions, need sort out special conditions here.
+obj/machinery/bot/floorbot/process_scan(var/scan_target)
+ var/result
+ var/turf/simulated/floor/F
+ switch(process_type)
+ if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
+ if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space.
+ result = scan_target
+ anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach.
+ if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered.
+ if(get_dir(src, scan_target) == targetdirection)
+ result = scan_target
+ anchored = 1
+ if(REPLACE_TILE)
+ F = scan_target
+ if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile.
+ result = F
+ if(FIX_TILE) //Selects only damaged floors.
+ F = scan_target
+ if(F.broken || F.burnt)
+ result = F
+ if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
+ F = scan_target
+ if(!istype(F, /turf/simulated/floor/plating))
+ result = F
+ else //If no special processing is needed, simply return the result.
+ result = scan_target
+ return result
+
+/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf)
+
+ if(istype(target_turf, /turf/space/))
+ //Must be a hull breach or in bridge mode to continue.
+ if(!is_hull_breach(target_turf) && !targetdirection)
+ target = null
+ return
+ else if(!istype(target_turf, /turf/simulated/floor))
+ return
+ if(amount <= 0)
+ mode = BOT_IDLE
+ target = null
+ return
+ anchored = 1
+ icon_state = "floorbot-c"
+ if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is
+ visible_message(" [targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ")
+ mode = BOT_REPAIRING
spawn(50)
- src.loc.icon_state = "floor"
- src.repairing = 0
- src.amount -= 1
- src.updateicon()
- src.anchored = 0
- src.target = null
+ if(mode == BOT_REPAIRING)
+ if(autotile) //Build the floor and include a tile.
+ target_turf.ChangeTurf(/turf/simulated/floor)
+ else //Build a hull plating without a floor tile.
+ target_turf.ChangeTurf(/turf/simulated/floor/plating)
+ mode = BOT_IDLE
+ amount -= 1
+ updateicon()
+ anchored = 0
+ target = null
+ else
+ var/turf/simulated/floor/F = target_turf
+ mode = BOT_REPAIRING
+ visible_message(" [src] begins repairing the floor.")
+ spawn(50)
+ if(mode == BOT_REPAIRING)
+ F.make_floor(/turf/simulated/floor)
+ mode = BOT_IDLE
+ amount -= 1
+ updateicon()
+ anchored = 0
+ target = null
/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
if(!istype(T, /obj/item/stack/tile/plasteel))
return
- visible_message("[src] begins to collect tiles.")
- src.repairing = 1
+ visible_message(" [src] begins to collect tiles.")
+ mode = BOT_REPAIRING
spawn(20)
if(isnull(T))
- src.target = null
- src.repairing = 0
+ target = null
+ mode = BOT_IDLE
return
- if(src.amount + T.amount > 50)
- var/i = 50 - src.amount
- src.amount += i
+ if(amount + T.amount > 50)
+ var/i = 50 - amount
+ amount += i
T.amount -= i
else
- src.amount += T.amount
+ amount += T.amount
qdel(T)
- src.updateicon()
- src.target = null
- src.repairing = 0
+ updateicon()
+ target = null
+ mode = BOT_IDLE
/obj/machinery/bot/floorbot/proc/maketile(var/obj/item/stack/sheet/metal/M)
if(!istype(M, /obj/item/stack/sheet/metal))
return
- if(M.amount > 1)
- return
- visible_message("[src] begins to create tiles.")
- src.repairing = 1
+ visible_message(" [src] begins to create tiles.")
+ mode = BOT_REPAIRING
spawn(20)
if(isnull(M))
- src.target = null
- src.repairing = 0
+ target = null
+ mode = BOT_IDLE
return
var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
T.amount = 4
T.loc = M.loc
- qdel(M)
- src.target = null
- src.repairing = 0
+ if(M.amount > 1)
+ M.amount--
+ else
+ qdel(M)
+ target = null
+ mode = BOT_IDLE
/obj/machinery/bot/floorbot/proc/updateicon()
- if(src.amount > 0)
- src.icon_state = "floorbot[src.on]"
+ if(amount > 0)
+ icon_state = "floorbot[on]"
else
- src.icon_state = "floorbot[src.on]e"
+ icon_state = "floorbot[on]e"
/obj/machinery/bot/floorbot/explode()
- src.on = 0
- src.visible_message("[src] blows apart!")
+ on = 0
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
@@ -397,7 +462,7 @@
amount -= 16
else
var/obj/item/stack/tile/plasteel/T = new (Tsec)
- T.amount = src.amount
+ T.amount = amount
amount = 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -411,7 +476,7 @@
if(!istype(T, /obj/item/stack/tile/plasteel))
..()
return
- if(src.contents.len >= 1)
+ if(contents.len >= 1)
user << "They won't fit in, as there is already stuff inside."
return
if(T.use(10))
@@ -431,7 +496,7 @@
if(isprox(W))
qdel(W)
var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
- B.created_name = src.created_name
+ B.created_name = created_name
user.put_in_hands(B)
user << "You add the sensor to the toolbox and tiles!"
user.unEquip(src, 1)
@@ -441,10 +506,10 @@
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
..()
@@ -452,16 +517,15 @@
qdel(W)
var/turf/T = get_turf(user.loc)
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
- A.name = src.created_name
+ A.name = created_name
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))
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name,MAX_NAME_LEN)
-
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
\ No newline at end of file
+ created_name = t
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 0625cf0ecef..feffa7f6454 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -13,31 +13,34 @@
anchored = 0
health = 20
maxhealth = 20
- req_access =list(access_medical)
+ req_one_access =list(access_medical, access_robotics)
var/stunned = 0 //It can be stunned by tasers. Delicate circuits.
// var/emagged = 0
var/list/botcard_access = list(access_medical)
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
- var/frustration = 0
- var/path[] = new()
var/mob/living/carbon/patient = null
var/mob/living/carbon/oldpatient = null
var/oldloc = null
var/last_found = 0
var/last_newpatient_speak = 0 //Don't spam the "HEY I'M COMING" messages
- var/currently_healing = 0
var/injection_amount = 15 //How much reagent do we inject at a time?
var/heal_threshold = 10 //Start healing when they have this much damage in a category
var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
-
+ var/declare_crit = 1 //If active, the bot will transmit a critical patient alert to MedHUD users.
+ var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
+ var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
+ radio_frequency = MED_FREQ //Medical frequency
//Setting which reagents to use to treat what by default. By id.
var/treatment_brute = "tricordrazine"
var/treatment_oxy = "tricordrazine"
var/treatment_fire = "tricordrazine"
var/treatment_tox = "tricordrazine"
var/treatment_virus = "spaceacillin"
+ var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
var/shut_up = 0 //self explanatory :)
+ bot_type = MED_BOT
+ bot_filter = RADIO_MEDBOT
/obj/machinery/bot/medbot/mysterious
name = "\improper Mysterious Medibot"
@@ -58,43 +61,63 @@
var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
w_class = 3.0
- New()
+ /obj/item/weapon/firstaid_arm_assembly/New()
..()
spawn(5)
- if(src.skin)
- src.overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]")
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
+/obj/machinery/bot/medbot/proc/updateicon()
+ if(!on)
+ icon_state = "medibot0"
+ return
+ if(mode == BOT_HEALING)
+ icon_state = "medibots[stationary_mode]"
+ return
+ else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
+ icon_state = "medibot2"
+ else
+ icon_state = "medibot1"
/obj/machinery/bot/medbot/New()
..()
- src.icon_state = "medibot[src.on]"
+ updateicon()
spawn(4)
- if(src.skin)
- src.overlays += image('icons/obj/aibots.dmi', "medskin_[src.skin]")
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
- src.botcard = new /obj/item/weapon/card/id(src)
- if(isnull(src.botcard_access) || (src.botcard_access.len < 1))
+ if(isnull(botcard_access) || (botcard_access.len < 1))
var/datum/job/doctor/J = new/datum/job/doctor
- src.botcard.access = J.get_access()
+ botcard.access = J.get_access()
else
- src.botcard.access = src.botcard_access
+ botcard.access = botcard_access
+ prev_access = botcard.access
+ add_to_beacons(bot_filter)
/obj/machinery/bot/medbot/turn_on()
. = ..()
- src.icon_state = "medibot[src.on]"
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
/obj/machinery/bot/medbot/turn_off()
..()
- src.patient = null
- src.oldpatient = null
- src.oldloc = null
- src.path = new()
- src.currently_healing = 0
- src.last_found = world.time
- src.icon_state = "medibot[src.on]"
- src.updateUsrDialog()
+ updateicon()
+ updateUsrDialog()
+
+/obj/machinery/bot/medbot/bot_reset()
+ ..()
+ patient = null
+ oldpatient = null
+ oldloc = null
+ last_found = world.time
+ declare_cooldown = 0
+
+/obj/machinery/bot/medbot/set_custom_texts()
+
+ text_hack = "You corrupt [name]'s reagent processor circuits."
+ text_dehack = "You reset [name]'s reagent processor circuits."
+ text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!"
/obj/machinery/bot/medbot/attack_paw(mob/user as mob)
return attack_hand(user)
@@ -105,99 +128,93 @@
return
var/dat
dat += hack(user)
- dat += "Automatic Medical Unit v1.0
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" + dat += "Medical Unit Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" dat += "Beaker: " - if (src.reagent_glass) - dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" + if (reagent_glass) + dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" else dat += "None Loaded" - dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) + dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) dat += "Healing Threshold: " dat += "-- " dat += "- " - dat += "[src.heal_threshold] " + dat += "[heal_threshold] " dat += "+ " dat += "++" dat += "
" dat += "Injection Level: " dat += "- " - dat += "[src.injection_amount] " + dat += "[injection_amount] " dat += "+ " dat += "
" dat += "Reagent Source: " - dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" + dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" + dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
" + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
" + dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" + dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
" - user << browse("Medibot v1.0 controls [dat]", "window=automed")
- onclose(user, "automed")
+ var/datum/browser/popup = new(user, "automed", "Automatic Medical Unit v1.1")
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/bot/medbot/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if ((href_list["power"]) && (src.allowed(usr)))
- if (src.on && !src.emagged)
- turn_off()
- else
- turn_on()
+ ..()
- else if((href_list["adj_threshold"]) && (!src.locked || issilicon(usr)))
+ if(href_list["adj_threshold"])
var/adjust_num = text2num(href_list["adj_threshold"])
- src.heal_threshold += adjust_num
- if(src.heal_threshold < 5)
- src.heal_threshold = 5
- if(src.heal_threshold > 75)
- src.heal_threshold = 75
+ heal_threshold += adjust_num
+ if(heal_threshold < 5)
+ heal_threshold = 5
+ if(heal_threshold > 75)
+ heal_threshold = 75
- else if((href_list["adj_inject"]) && (!src.locked || issilicon(usr)))
+ else if(href_list["adj_inject"])
var/adjust_num = text2num(href_list["adj_inject"])
- src.injection_amount += adjust_num
- if(src.injection_amount < 5)
- src.injection_amount = 5
- if(src.injection_amount > 15)
- src.injection_amount = 15
+ injection_amount += adjust_num
+ if(injection_amount < 5)
+ injection_amount = 5
+ if(injection_amount > 15)
+ injection_amount = 15
- else if((href_list["use_beaker"]) && (!src.locked || issilicon(usr)))
- src.use_beaker = !src.use_beaker
+ else if(href_list["use_beaker"])
+ use_beaker = !use_beaker
- else if (href_list["eject"] && (!isnull(src.reagent_glass)))
- if(!src.locked)
- src.reagent_glass.loc = get_turf(src)
- src.reagent_glass = null
- else
- usr << "You cannot eject the beaker because the panel is locked."
+ else if (href_list["eject"] && (!isnull(reagent_glass)))
+ reagent_glass.loc = get_turf(src)
+ reagent_glass = null
- else if ((href_list["togglevoice"]) && (!src.locked || issilicon(usr)))
- src.shut_up = !src.shut_up
+ else if (href_list["togglevoice"])
+ shut_up = !shut_up
- else if (href_list["operation"])
- if(!src.emagged)
- src.emagged = 2
- src.hacked = 1
- usr << "You corrupt [src]'s reagent processor circuits."
- else if(!src.hacked)
- usr << "[src] seems damaged and does not respond to reprogramming!"
- else
- src.hacked = 0
- src.emagged = 0
- usr << "You reset [src]'s reagent circuits."
- src.updateUsrDialog()
+ else if (href_list["critalerts"])
+ declare_crit = !declare_crit
+
+ else if (href_list["stationary"])
+ stationary_mode = !stationary_mode
+ path = list()
+ updateicon()
+
+ else if (href_list["virus"])
+ treat_virus = !treat_virus
+
+ updateUsrDialog()
return
/obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if (src.allowed(user) && !open && !emagged)
- src.locked = !src.locked
- user << "Controls are now [src.locked ? "locked." : "unlocked."]"
- src.updateUsrDialog()
+ if (allowed(user) && !open && !emagged)
+ locked = !locked
+ user << "Controls are now [locked ? "locked." : "unlocked."]"
+ updateUsrDialog()
else
if(emagged)
user << "ERROR"
@@ -207,127 +224,127 @@
user << "Access denied."
else if (istype(W, /obj/item/weapon/reagent_containers/glass))
- if(src.locked)
+ if(locked)
user << "You cannot insert a beaker because the panel is locked."
return
- if(!isnull(src.reagent_glass))
+ if(!isnull(reagent_glass))
user << "There is already a beaker loaded."
return
user.drop_item()
W.loc = src
- src.reagent_glass = W
+ reagent_glass = W
user << "You insert [W]."
- src.updateUsrDialog()
+ updateUsrDialog()
return
else
+ var/current_health = health
..()
- if (health < maxhealth && !istype(W, /obj/item/weapon/screwdriver) && W.force)
+ if (health < current_health) //if medbot took some damage
step_to(src, (get_step_away(src,user)))
/obj/machinery/bot/medbot/Emag(mob/user as mob)
..()
- if(open && !locked)
- if(user) user << "You short out [src]'s reagent synthesis circuits."
+ if(emagged == 2)
+ declare_crit = 0
+ if(user)
+ user << "You short out [src]'s reagent synthesis circuits."
spawn(0)
audible_message("[src] buzzes oddly!")
flick("medibot_spark", src)
- src.patient = null
- if(user) src.oldpatient = user
- src.currently_healing = 0
- src.last_found = world.time
- src.anchored = 0
- src.emagged = 2
- src.on = 1
- src.icon_state = "medibot[src.on]"
+ if(user)
+ oldpatient = user
-/obj/machinery/bot/medbot/process()
- set background = BACKGROUND_ENABLED
-
- if(!src.on)
- src.stunned = 0
+/obj/machinery/bot/medbot/process_scan(var/mob/living/carbon/human/H)
+ if (H.stat == 2)
return
- if(src.stunned)
- src.icon_state = "medibota"
- src.stunned--
-
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
-
- if(src.stunned <= 0)
- src.icon_state = "medibot[src.on]"
- src.stunned = 0
+ if ((H == oldpatient) && (world.time < last_found + 100))
return
- if(src.frustration > 8)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
- src.path = new()
+ if(assess_patient(H))
+ last_found = world.time
+ if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
+ var/message = pick("Hey, [H.name]! Hold on, I'm coming.","Wait [H.name]! I want to help!","[H.name], you appear to be injured!")
+ speak(message)
+ last_newpatient_speak = world.time
+ return H
+ else
+ return
- if(!src.patient)
- if(!src.shut_up && prob(1))
+/obj/machinery/bot/medbot/bot_process()
+ if (!..())
+ return
+
+ if(mode == BOT_HEALING)
+ return
+
+ if(stunned)
+ icon_state = "medibota"
+ stunned--
+
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+
+ if(stunned <= 0)
+ updateicon()
+ stunned = 0
+ return
+
+ if(frustration > 8)
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
+ path = list()
+
+ if(!patient)
+ if(!shut_up && prob(1))
var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
- src.speak(message)
+ speak(message)
+ var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
+ patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
+ oldpatient = patient
- for (var/mob/living/carbon/C in view(7,src)) //Time to find a patient!
- if ((C.stat == 2) || !istype(C, /mob/living/carbon/human))
- continue
-
- if ((C == src.oldpatient) && (world.time < src.last_found + 100))
- continue
-
- if(src.assess_patient(C))
- src.patient = C
- src.oldpatient = C
- src.last_found = world.time
- if((src.last_newpatient_speak + 300) < world.time) //Don't spam these messages!
- var/message = pick("Hey, [C.name]! Hold on, I'm coming.","Wait [C.name]! I want to help!","[C.name], you appear to be injured!")
- src.speak(message)
- src.last_newpatient_speak = world.time
- break
- else
- continue
-
-
- if(src.patient && (get_dist(src,src.patient) <= 1))
- if(!src.currently_healing)
- src.currently_healing = 1
- src.frustration = 0
- src.medicate_patient(src.patient)
+ if(patient && (get_dist(src,patient) <= 1)) //Patient is next to us, begin treatment!
+ if(mode != BOT_HEALING)
+ mode = BOT_HEALING
+ updateicon()
+ frustration = 0
+ medicate_patient(patient)
return
- else if(src.patient && (src.path.len) && (get_dist(src.patient,src.path[src.path.len]) > 2))
- src.path = new()
- src.currently_healing = 0
- src.last_found = world.time
+ //Patient has moved away from us!
+ else if(patient && path && path.len && (get_dist(patient,path[path.len]) > 2))
+ path = list()
+ mode = BOT_IDLE
+ last_found = world.time
- if(src.patient && src.path.len == 0 && (get_dist(src,src.patient) > 1))
+ if(!stationary_mode && patient && path.len == 0 && (get_dist(src,patient) > 1))
spawn(0)
- src.path = AStar(src.loc, get_turf(src.patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
- if(!src.path)
- src.path = list()
- if(src.path.len == 0)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ path = AStar(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
+ if(!path)
+ path = list()
+
+ if(path.len > 0 && patient)
+ if(!bot_move(patient))
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
- if(src.path.len > 0 && src.patient)
- step_to(src, src.path[1])
- src.path -= src.path[1]
- spawn(3)
- if(src.path.len)
- step_to(src, src.path[1])
- src.path -= src.path[1]
+ if(path.len > 8 && patient)
+ frustration++
- if(src.path.len > 8 && src.patient)
- src.frustration++
+ if(auto_patrol && !stationary_mode && !patient)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
return
@@ -339,127 +356,131 @@
if(C.suiciding)
return 0 //Kevorkian school of robotic medical assistants.
- if(src.emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
+ if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
return 1
+ if(declare_crit && C.health <= 0) //Critical condition! Call for help!
+ declare(C)
+
//If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
- if((src.reagent_glass) && (src.use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
- for(var/datum/reagent/R in src.reagent_glass.reagents.reagent_list)
+ if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
if(!C.reagents.has_reagent(R.id))
return 1
//They're injured enough for it!
- if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_brute)))
+ if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute)))
return 1 //If they're already medicated don't bother!
- if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(src.treatment_oxy)))
+ if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy)))
return 1
- if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_fire)))
+ if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire)))
return 1
- if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_tox)))
+ if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
return 1
+ if(treat_virus)
+ for(var/datum/disease/D in C.viruses)
+ if((D.hidden[SCANNER]) || (D.hidden[PANDEMIC])) //the medibot can't detect viruses that are undetectable to Health Analyzers or Pandemic machines.
+ return 0
+ if(D.severity == D.non_threat) // medibot doesn't try to heal truly harmless viruses
+ return 0
+ if((D.stage > 1) || (D.spread_type == AIRBORNE)) // medibot can't detect a virus in its initial stage unless it spreads airborne.
- for(var/datum/disease/D in C.viruses)
- if((D.hidden[SCANNER]) || (D.hidden[PANDEMIC])) //the medibot can't detect viruses that are undetectable to Health Analyzers or Pandemic machines.
- return 0
- if(D.severity == D.non_threat) // medibot doesn't try to heal truly harmless viruses
- return 0
- if((D.stage > 1) || (D.spread_type == AIRBORNE)) // medibot can't detect a virus in its initial stage unless it spreads airborne.
-
- if (!C.reagents.has_reagent(src.treatment_virus))
- return 1 //STOP DISEASE FOREVER
+ if (!C.reagents.has_reagent(treatment_virus))
+ return 1 //STOP DISEASE FOREVER
return 0
/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob)
- if(!src.on)
+ if(!on)
return
if(!istype(C))
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
if(C.stat == 2)
var/death_message = pick("No! NO!","Live, damnit! LIVE!","I...I've never lost a patient before. Not today, I mean.")
- src.speak(death_message)
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ speak(death_message)
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
return
var/reagent_id = null
- if(src.emagged == 2) //Emagged! Time to poison everybody.
+ if(emagged == 2) //Emagged! Time to poison everybody.
reagent_id = "toxin"
else
- var/virus = 0
- for(var/datum/disease/D in C.viruses)
- if((!D.hidden[SCANNER]) && (!D.hidden[PANDEMIC])) //detectable virus
- if(D.severity != D.non_threat) //virus is harmful
- if((D.stage > 1) || (D.spread_type == AIRBORNE))
- virus = 1
+ if(treat_virus)
+ var/virus = 0
+ for(var/datum/disease/D in C.viruses)
+ if((!D.hidden[SCANNER]) && (!D.hidden[PANDEMIC])) //detectable virus
+ if(D.severity != D.non_threat) //virus is harmful
+ if((D.stage > 1) || (D.spread_type == AIRBORNE))
+ virus = 1
- if (!reagent_id && (virus))
- if(!C.reagents.has_reagent(src.treatment_virus))
- reagent_id = src.treatment_virus
+ if (!reagent_id && (virus))
+ if(!C.reagents.has_reagent(treatment_virus))
+ reagent_id = treatment_virus
if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_brute))
- reagent_id = src.treatment_brute
+ if(!C.reagents.has_reagent(treatment_brute))
+ reagent_id = treatment_brute
if (!reagent_id && (C.getOxyLoss() >= (15 + heal_threshold)))
- if(!C.reagents.has_reagent(src.treatment_oxy))
- reagent_id = src.treatment_oxy
+ if(!C.reagents.has_reagent(treatment_oxy))
+ reagent_id = treatment_oxy
if (!reagent_id && (C.getFireLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_fire))
- reagent_id = src.treatment_fire
+ if(!C.reagents.has_reagent(treatment_fire))
+ reagent_id = treatment_fire
if (!reagent_id && (C.getToxLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(src.treatment_tox))
- reagent_id = src.treatment_tox
+ if(!C.reagents.has_reagent(treatment_tox))
+ reagent_id = treatment_tox
//If the patient is injured but doesn't have our special reagent in them then we should give it to them first
- if(reagent_id && src.use_beaker && src.reagent_glass && src.reagent_glass.reagents.total_volume)
- for(var/datum/reagent/R in src.reagent_glass.reagents.reagent_list)
+ if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
if(!C.reagents.has_reagent(R.id))
reagent_id = "internal_beaker"
break
if(!reagent_id) //If they don't need any of that they're probably cured!
- src.oldpatient = src.patient
- src.patient = null
- src.currently_healing = 0
- src.last_found = world.time
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
var/message = pick("All patched up!","An apple a day keeps me away.","Feel better soon!")
- src.speak(message)
+ speak(message)
+ updateicon()
return
else
- src.icon_state = "medibots"
- C.visible_message("[src] is trying to inject [src.patient]!", \
- "[src] is trying to inject [src.patient]!")
+ C.visible_message("[src] is trying to inject [patient]!", \
+ "[src] is trying to inject [patient]!")
spawn(30)
- if ((get_dist(src, src.patient) <= 1) && (src.on))
+ if ((get_dist(src, patient) <= 1) && (on))
if(reagent_id == "internal_beaker")
- if(src.use_beaker && src.reagent_glass && src.reagent_glass.reagents.total_volume)
- src.reagent_glass.reagents.trans_to(src.patient,src.injection_amount) //Inject from beaker instead.
- src.reagent_glass.reagents.reaction(src.patient, 2)
+ if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ reagent_glass.reagents.trans_to(patient,injection_amount) //Inject from beaker instead.
+ reagent_glass.reagents.reaction(patient, 2)
else
- src.patient.reagents.add_reagent(reagent_id,src.injection_amount)
- C.visible_message("[src] injects [src.patient] with the syringe!", \
- "[src] injects [src.patient] with the syringe!")
+ patient.reagents.add_reagent(reagent_id,injection_amount)
+ C.visible_message("[src] injects [patient] with the syringe!", \
+ "[src] injects [patient] with the syringe!")
- src.icon_state = "medibot[src.on]"
- src.currently_healing = 0
+ mode = BOT_IDLE
+ updateicon()
return
reagent_id = null
@@ -467,11 +488,11 @@
/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj)
if(Proj.flag == "taser")
- src.stunned = min(stunned+10,20)
+ stunned = min(stunned+10,20)
..()
/obj/machinery/bot/medbot/explode()
- src.on = 0
+ on = 0
visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
@@ -481,9 +502,9 @@
new /obj/item/device/healthanalyzer(Tsec)
- if(src.reagent_glass)
- src.reagent_glass.loc = Tsec
- src.reagent_glass = null
+ if(reagent_glass)
+ reagent_glass.loc = Tsec
+ reagent_glass = null
if (prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
@@ -494,54 +515,14 @@
qdel(src)
return
-/obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
- if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
- var/obj/machinery/door/D = M
- if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
- D.open()
- src.frustration = 0
- else if ((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
- return
-
-/* terrible
-/obj/machinery/bot/medbot/Bumped(atom/movable/M as mob|obj)
- spawn(0)
- if (M)
- var/turf/T = get_turf(src)
- M:loc = T
-*/
-
-/*
- * Pathfinding procs, allow the medibot to path through doors it has access to.
- */
-
-//Pretty ugh
-/*
-/turf/proc/AdjacentTurfsAllowMedAccess()
- var/L[] = new()
- for(var/turf/t in oview(src,1))
- if(!t.density)
- if(!LinkBlocked(src, t) && !TurfBlockedNonWindowNonDoor(t,get_access("Medical Doctor")))
- L.Add(t)
- return L
-
-
-//It isn't blocked if we can open it, man.
-/proc/TurfBlockedNonWindowNonDoor(turf/loc, var/list/access)
- for(var/obj/O in loc)
- if(O.density && !istype(O, /obj/structure/window) && !istype(O, /obj/machinery/door))
- return 1
-
- if (O.density && (istype(O, /obj/machinery/door)) && (access.len))
- var/obj/machinery/door/D = O
- for(var/req in D.req_access)
- if(!(req in access)) //doesn't have this access
- return 1
-
- return 0
-*/
+/obj/machinery/bot/medbot/proc/declare(var/crit_patient)
+ if(declare_cooldown)
+ return
+ var/area/location = get_area(src)
+ speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!",radio_frequency)
+ declare_cooldown = 1
+ spawn(200) //Twenty seconds
+ declare_cooldown = 0
/*
* Medbot Assembly -- Can be made out of all three medkits.
@@ -554,7 +535,7 @@
return
//Making a medibot!
- if(src.contents.len >= 1)
+ if(contents.len >= 1)
user << "You need to empty [src] out first."
return
@@ -579,30 +560,30 @@
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name,MAX_NAME_LEN)
if (!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.created_name = t
+ created_name = t
else
switch(build_step)
if(0)
if(istype(W, /obj/item/device/healthanalyzer))
user.drop_item()
qdel(W)
- src.build_step++
+ build_step++
user << "You add the health sensor to [src]."
- src.name = "First aid/robot arm/health analyzer assembly"
- src.overlays += image('icons/obj/aibots.dmi', "na_scanner")
+ name = "First aid/robot arm/health analyzer assembly"
+ overlays += image('icons/obj/aibots.dmi', "na_scanner")
if(1)
if(isprox(W))
user.drop_item()
qdel(W)
- src.build_step++
+ build_step++
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 = src.skin
- S.name = src.created_name
+ S.skin = skin
+ S.name = created_name
user.unEquip(src, 1)
qdel(src)
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index bad30b9b2e5..0c151a22ab0 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -19,34 +19,28 @@ var/global/mulebot_count = 0
fire_dam_coeff = 0.7
brute_dam_coeff = 0.5
var/atom/movable/load = null // the loaded crate (usually)
- var/beacon_freq = 1400
- var/control_freq = 1447
+ var/list/delivery_beacons = list() //List of beacons that serve as delivery locations.
+ beacon_freq = 1400
+ control_freq = 1447
+ bot_type = MULE_BOT
+ bot_filter = RADIO_MULEBOT
suffix = ""
var/turf/target // this is turf to navigate to (location of beacon)
var/loaddir = 0 // this the direction to unload onto/load from
- var/new_destination = "" // pending new destination (waiting for beacon response)
- var/destination = "" // destination description
var/home_destination = "" // tag of home beacon
req_access = list(access_cargo) // added robotics access so assembly line drop-off works properly -veyveyr //I don't think so, Tim. You need to add it to the MULE's hidden robot ID card. -NEO
- var/path[] = new()
- var/mode = 0 //0 = idle/ready
- //1 = loading/unloading
- //2 = moving to deliver
- //3 = returning to home
- //4 = blocked
- //5 = computing navigation
- //6 = waiting for nav computation
- //7 = no destination beacon found (or no route)
+ mode = BOT_IDLE
- var/blockcount = 0 //number of times retried a blocked path
+ blockcount = 0 //number of times retried a blocked path
var/reached_target = 1 //true if already reached the target
- var/refresh = 1 // true to refresh dialogue
- var/auto_return = 1 // true if auto return to home beacon after unload
- var/auto_pickup = 1 // true if auto-pickup at beacon
+ var/refresh = 1 // true to refresh dialogue
+ var/auto_return = 1 // true if auto return to home beacon after unload
+ var/auto_pickup = 1 // true if auto-pickup at beacon
+ var/report_delivery = 1 // true if bot will announce an arrival to a location.
var/obj/item/weapon/stock_parts/cell/cell
var/datum/wires/mulebot/wires = null
@@ -67,18 +61,16 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/New()
..()
wires = new(src)
- botcard = new(src)
var/datum/job/cargo_tech/J = new/datum/job/cargo_tech
botcard.access = J.get_access()
+ prev_access = botcard.access
// botcard.access += access_robotics //Why --Ikki
cell = new(src)
cell.charge = 2000
cell.maxcharge = 2000
spawn(5) // must wait for map loading to finish
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+ add_to_beacons(bot_filter)
mulebot_count += 1
if(!suffix)
@@ -86,9 +78,6 @@ var/global/mulebot_count = 0
name = "\improper Mulebot ([suffix])"
- verbs -= /atom/movable/verb/pull
-
-
// attack by item
// emag : lock/unlock,
@@ -100,8 +89,8 @@ var/global/mulebot_count = 0
locked = !locked
user << "You [locked ? "lock" : "unlock"] the mulebot's controls!"
flick("mulebot-emagged", src)
- playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0)
- else if(istype(I, /obj/item/weapon/card/id))
+ playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
+ else if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
if(toggle_lock(user))
user << "Controls [(locked ? "locked" : "unlocked")]."
@@ -118,30 +107,30 @@ var/global/mulebot_count = 0
open = !open
if(open)
- src.visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.")
+ visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.")
on = 0
icon_state="mulebot-hatch"
else
- src.visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.")
+ visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.")
icon_state = "mulebot0"
updateDialog()
else if (istype(I, /obj/item/weapon/wrench))
- if (src.health < maxhealth)
- src.health = min(maxhealth, src.health+25)
+ if (health < maxhealth)
+ health = min(maxhealth, health+25)
user.visible_message(
- "[user] repairs [src]!",
+ "[user] repairs [src]!",
"You repair [src]!"
)
else
- user << "[src] does not need a repair!"
+ user << " [src] does not need a repair!"
else if(istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters))
if(open)
attack_hand(usr)
else if(load && ismob(load)) // chance to knock off rider
if(prob(1+I.force * 2))
unload(0)
- user.visible_message("[user] knocks [load] off [src] with \the [I]!", "You knock [load] off [src] with \the [I]!")
+ 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."
else
@@ -164,7 +153,7 @@ var/global/mulebot_count = 0
if(prob(50) && !isnull(load))
unload(0)
if(prob(25))
- src.visible_message("Something shorts out inside [src]!")
+ visible_message(" Something shorts out inside [src]!")
wires.RandomCut()
..()
@@ -182,29 +171,30 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0)
var/dat
- dat += "
" dat += "Power: [on ? "On" : "Off"]
" if(!open) dat += "
" @@ -225,6 +215,7 @@ var/global/mulebot_count = 0 dat += "Set Home
" dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" + dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -245,9 +236,9 @@ var/global/mulebot_count = 0 //user << browse("M.U.L.E. Mk. III [suffix ? "([suffix])" : ""] [dat]", "window=mulebot;size=350x500")
//onclose(user, "mulebot")
- var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. III [suffix ? "([suffix])" : ""]", 350, 500)
+ var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 500)
popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
return
@@ -261,7 +252,7 @@ var/global/mulebot_count = 0
return
if (usr.stat)
return
- if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
+ if ((in_range(src, usr) && istype(loc, /turf)) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
switch(href_list["op"])
@@ -269,7 +260,7 @@ var/global/mulebot_count = 0
toggle_lock(usr)
if("power")
- if (src.on)
+ if (on)
turn_off()
else if (cell && !open)
if (!turn_on())
@@ -305,23 +296,23 @@ var/global/mulebot_count = 0
if("stop")
- if(mode >=2)
- mode = 0
+ if(mode >= BOT_DELIVER)
+ bot_reset()
updateDialog()
if("go")
- if(mode == 0)
+ if(mode == BOT_IDLE)
start()
updateDialog()
if("home")
- if(mode == 0 || mode == 2)
+ if(mode == BOT_IDLE || mode == BOT_DELIVER)
start_home()
updateDialog()
if("destination")
refresh=0
- var/new_dest = input("Enter new destination tag", "Mulebot [suffix ? "([suffix])" : ""]", destination) as text|null
+ var/new_dest = input("Select M.U.L.E. Destination", "Mulebot [suffix ? "([suffix])" : ""]", destination) as null|anything in delivery_beacons
refresh=1
if(new_dest)
set_destination(new_dest)
@@ -357,12 +348,15 @@ var/global/mulebot_count = 0
if("autopick")
auto_pickup = !auto_pickup
+ if("report")
+ report_delivery = !report_delivery
+
if("close")
usr.unset_machine()
usr << browse(null,"window=mulebot")
updateDialog()
- //src.updateUsrDialog()
+ //updateUsrDialog()
else
usr << browse(null, "window=mulebot")
usr.unset_machine()
@@ -375,7 +369,7 @@ var/global/mulebot_count = 0
return !open && cell && cell.charge > 0 && wires.HasPower()
/obj/machinery/bot/mulebot/proc/toggle_lock(var/mob/user)
- if(src.allowed(user))
+ if(allowed(user))
locked = !locked
updateDialog()
return 1
@@ -403,8 +397,8 @@ var/global/mulebot_count = 0
// called to load a crate
/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C)
if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate))
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ 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
//I'm sure someone will come along and ask why this is here... well people were dragging screen items onto the mule, and that was not cool.
@@ -416,16 +410,16 @@ var/global/mulebot_count = 0
if(get_dist(C, src) > 1 || load || !on)
return
- mode = 1
+ mode = BOT_LOADING
// if a create, close before loading
var/obj/structure/closet/crate/crate = C
if(istype(crate))
crate.close()
- C.loc = src.loc
+ C.loc = loc
sleep(2)
- if(C.loc != src.loc) //To prevent you from going onto more thano ne bot.
+ if(C.loc != loc) //To prevent you from going onto more thano ne bot.
return
C.loc = src
load = C
@@ -441,7 +435,7 @@ var/global/mulebot_count = 0
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
- mode = 0
+ mode = BOT_IDLE
send_status()
// called to unload the bot
@@ -451,7 +445,7 @@ var/global/mulebot_count = 0
if(!load)
return
- mode = 1
+ mode = BOT_LOADING
overlays.Cut()
if(ismob(load))
@@ -461,11 +455,11 @@ var/global/mulebot_count = 0
M.client.eye = src
- load.loc = src.loc
+ load.loc = loc
load.pixel_y -= 9
load.layer = initial(load.layer)
if(dirn)
- var/turf/T = src.loc
+ var/turf/T = loc
var/turf/newT = get_step(T,dirn)
if(load.CanPass(load,newT)) //Can't get off onto anything that wouldn't let you pass normally
step(load, dirn)
@@ -477,9 +471,9 @@ var/global/mulebot_count = 0
// with items dropping as mobs are loaded
for(var/atom/movable/AM in src)
- if(AM == cell || AM == botcard) continue
+ if(AM == cell || istype(AM , botcard) || AM == Radio) continue
- AM.loc = src.loc
+ AM.loc = loc
AM.layer = initial(AM.layer)
AM.pixel_y = initial(AM.pixel_y)
if(ismob(AM))
@@ -487,10 +481,19 @@ var/global/mulebot_count = 0
if(M.client)
M.client.perspective = MOB_PERSPECTIVE
M.client.eye = src
- mode = 0
+ mode = BOT_IDLE
+/obj/machinery/bot/mulebot/call_bot()
+ ..()
+ var/area/dest_area
+ if (path && path.len)
+ target = ai_waypoint //Target is the end point of the path, the waypoint set by the AI.
+ dest_area = get_area(target)
+ destination = format_text(dest_area.name)
+ pathset = 1 //Indicates the AI's custom path is initialized.
+ start()
-/obj/machinery/bot/mulebot/process()
+/obj/machinery/bot/mulebot/bot_process()
if(!has_power())
on = 0
return
@@ -520,13 +523,14 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/proc/process_bot()
//if(mode) world << "Mode: [mode]"
+
switch(mode)
- if(0) // idle
+ if(BOT_IDLE) // idle
icon_state = "mulebot0"
return
- if(1) // loading/unloading
+ if(BOT_LOADING) // loading/unloading
return
- if(2,3,4) // navigating to deliver,home, or blocked
+ if(BOT_DELIVER,BOT_GO_HOME,BOT_BLOCKED) // navigating to deliver,home, or blocked
if(loc == target) // reached target
at_target()
@@ -569,14 +573,14 @@ var/global/mulebot_count = 0
path -= loc
- if(mode==4)
+ if(mode == BOT_BLOCKED)
spawn(1)
send_status()
if(destination == home_destination)
- mode = 3
+ mode = BOT_GO_HOME
else
- mode = 2
+ mode = BOT_DELIVER
else // failed to move
@@ -585,73 +589,74 @@ var/global/mulebot_count = 0
blockcount++
- mode = 4
+ mode = BOT_BLOCKED
if(blockcount == 3)
- src.visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ 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
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ 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)
- src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
- playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
- mode = 4
- mode =6
+ 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
- src.visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ 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 = 5
+ mode = BOT_NAV
return
else
//world << "No path."
- mode = 5
+ mode = BOT_NAV
return
- if(5) // calculate new path
+ if(BOT_NAV) // calculate new path
//world << "Calc new path."
- mode = 6
+ mode = BOT_WAIT_FOR_NAV
spawn(0)
calc_path()
if(path.len > 0)
blockcount = 0
- mode = 4
- src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
- playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+ mode = BOT_BLOCKED
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ playsound(loc, 'sound/machines/ping.ogg', 50, 0)
else
- src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
- mode = 7
+ mode = BOT_NO_ROUTE
//if(6)
//world << "Pending path calc."
//if(7)
//world << "No dest / no route."
+
return
// calculates a path to the current destination
// given an optional turf to avoid
-/obj/machinery/bot/mulebot/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, src.target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
+/obj/machinery/bot/mulebot/calc_path(var/turf/avoid = null)
+ path = AStar(loc, target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
+ if(!path)
+ path = list()
// sets the current destination
// signals all beacons matching the delivery code
// beacons will return a signal giving their locations
-/obj/machinery/bot/mulebot/proc/set_destination(var/new_dest)
+/obj/machinery/bot/mulebot/set_destination(var/new_dest)
spawn(0)
new_destination = new_dest
post_signal(beacon_freq, "findbeacon", "delivery")
@@ -660,9 +665,9 @@ var/global/mulebot_count = 0
// starts bot moving to current destination
/obj/machinery/bot/mulebot/proc/start()
if(destination == home_destination)
- mode = 3
+ mode = BOT_GO_HOME
else
- mode = 2
+ mode = BOT_DELIVER
icon_state = "mulebot[(wires.MobAvoid() != 0)]"
// starts bot moving to home
@@ -670,17 +675,27 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/proc/start_home()
spawn(0)
set_destination(home_destination)
- mode = 4
+ mode = BOT_BLOCKED
icon_state = "mulebot[(wires.MobAvoid() != 0)]"
// called when bot reaches current target
/obj/machinery/bot/mulebot/proc/at_target()
if(!reached_target)
- src.visible_message("[src] makes a chiming sound!", "You hear a chime.")
- playsound(src.loc, 'sound/machines/chime.ogg', 50, 0)
+ radio_frequency = SUPP_FREQ //Supply channel
+ visible_message("[src] makes a chiming sound!", "You hear a chime.")
+ playsound(loc, 'sound/machines/chime.ogg', 50, 0)
reached_target = 1
+ if(pathset) //The AI called us here, so notify it of our arrival.
+ loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing".
+ if(calling_ai)
+ calling_ai << "\icon[src] [src] wirelessly plays a chiming sound!"
+ playsound(calling_ai, 'sound/machines/chime.ogg',40, 0)
+ calling_ai = null
+ radio_frequency = AIPRIV_FREQ //Report on AI Private instead if the AI is controlling us.
+
if(load) // if loaded, unload at target
+ speak("Destination [destination] reached. Unloading [load].",radio_frequency)
unload(loaddir)
else
// not loaded
@@ -695,14 +710,16 @@ var/global/mulebot_count = 0
AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir)
if(AM)
load(AM)
+ if(report_delivery)
+ speak("Now loading [load] at [get_area(src)].", radio_frequency)
// whatever happened, check to see if we return home
if(auto_return && destination != home_destination)
// auto return set and not at home already
start_home()
- mode = 4
+ mode = BOT_BLOCKED
else
- mode = 0 // otherwise go idle
+ bot_reset() // otherwise go idle
send_status() // report status to anyone listening
@@ -714,13 +731,12 @@ var/global/mulebot_count = 0
var/mob/M = obs
if(ismob(M))
if(istype(M,/mob/living/silicon/robot))
- src.visible_message("[src] bumps into [M]!")
+ visible_message("[src] bumps into [M]!")
else
- src.visible_message("[src] knocks over [M]!")
+ visible_message("[src] knocks over [M]!")
M.stop_pulling()
M.Stun(8)
M.Weaken(5)
- M.lying = 1
..()
/obj/machinery/bot/mulebot/alter_health()
@@ -730,8 +746,8 @@ var/global/mulebot_count = 0
// called from mob/living/carbon/human/Crossed()
// when mulebot is in the same loc
/obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H)
- src.visible_message("[src] drives over [H]!")
- playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
+ visible_message("[src] drives over [H]!")
+ playsound(loc, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(5,15)
H.apply_damage(2*damage, BRUTE, "head")
@@ -741,7 +757,7 @@ var/global/mulebot_count = 0
H.apply_damage(0.5*damage, BRUTE, "l_arm")
H.apply_damage(0.5*damage, BRUTE, "r_arm")
- var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+ var/obj/effect/decal/cleanable/blood/B = new(loc)
B.blood_DNA = list()
B.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type
@@ -779,7 +795,7 @@ var/global/mulebot_count = 0
// process control input
switch(recv)
if("stop")
- mode = 0
+ bot_reset()
return
if("go")
@@ -815,6 +831,7 @@ var/global/mulebot_count = 0
// receive response from beacon
recv = signal.data["beacon"]
+
if(wires.BeaconRX())
if(recv == new_destination) // if the recvd beacon location matches the set destination
// the we will navigate there
@@ -829,12 +846,18 @@ var/global/mulebot_count = 0
calc_path()
updateDialog()
+ //Detects and stores current active delivery beacons.
+ if(signal.data["beacon"])
+ if(!delivery_beacons)
+ delivery_beacons = new()
+ delivery_beacons[signal.data["beacon"] ] = signal.source
+
// send a radio signal with a single data key/value pair
-/obj/machinery/bot/mulebot/proc/post_signal(var/freq, var/key, var/value)
+/obj/machinery/bot/mulebot/post_signal(var/freq, var/key, var/value)
post_signal_multiple(freq, list("[key]" = value) )
// send a radio signal with multiple data key/values
-/obj/machinery/bot/mulebot/proc/post_signal_multiple(var/freq, var/list/keyval)
+/obj/machinery/bot/mulebot/post_signal_multiple(var/freq, var/list/keyval)
if(freq == beacon_freq && !(wires.BeaconRX()))
return
@@ -856,17 +879,17 @@ var/global/mulebot_count = 0
//world << "sent [key],[keyval[key]] on [freq]"
if (signal.data["findbeacon"])
frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if (signal.data["type"] == "mulebot")
+ else if (signal.data["type"] == MULE_BOT)
frequency.post_signal(src, signal, filter = RADIO_MULEBOT)
else
frequency.post_signal(src, signal)
// signals bot status etc. to controller
-/obj/machinery/bot/mulebot/proc/send_status()
+/obj/machinery/bot/mulebot/send_status()
var/list/kv = list(
- "type" = "mulebot",
+ "type" = MULE_BOT,
"name" = suffix,
- "loca" = (loc ? loc.loc : "Unknown"), // somehow loc can be null and cause a runtime - Quarxink
+ "loca" = get_area(src),
"mode" = mode,
"powr" = (cell ? cell.percent() : 0),
"dest" = destination,
@@ -886,7 +909,7 @@ var/global/mulebot_count = 0
/obj/machinery/bot/mulebot/explode()
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/device/assembly/prox_sensor(Tsec)
@@ -902,6 +925,6 @@ var/global/mulebot_count = 0
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
unload(0)
qdel(src)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index f06ca78cf5a..dc04bb2fdb9 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -17,45 +17,23 @@
var/threatlevel = 0
var/target_lastloc //Loc of target when arrested.
var/last_found //There's a delay
- var/frustration = 0
// var/emagged = 0 //Emagged Secbots view everyone as a criminal
- var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds?
+ var/declare_arrests = 1 //When making an arrest, should it notify everyone on the security channel?
var/idcheck = 0 //If true, arrest people with no IDs
- var/weaponscheck = 0 //If true, arrest people for weapons if they don't have access
+ var/weaponscheck = 0 //If true, arrest people for weapons if they lack access
var/check_records = 1 //Does it check security records?
var/arrest_type = 0 //If true, don't handcuff
-
- var/mode = 0
-#define SECBOT_IDLE 0 // idle
-#define SECBOT_HUNT 1 // found target, hunting
-#define SECBOT_PREP_ARREST 2 // at target, preparing to arrest
-#define SECBOT_ARREST 3 // arresting target
-#define SECBOT_START_PATROL 4 // start patrol
-#define SECBOT_PATROL 5 // patrolling
-#define SECBOT_SUMMON 6 // summoned by PDA
-
- var/auto_patrol = 0 // set to make bot automatically patrol
-
- var/beacon_freq = 1445 // navigation beacon frequency
- var/control_freq = 1447 // bot control frequency
+ radio_frequency = SEC_FREQ //Security channel
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
//List of weapons that secbots will not arrest for
var/safe_weapons = list(\
/obj/item/weapon/gun/energy/laser/bluetag,\
/obj/item/weapon/gun/energy/laser/redtag,\
- /obj/item/weapon/gun/energy/laser/practice)
-
- var/turf/patrol_target // this is turf to navigate to (location of beacon)
- var/new_destination // pending new destination (waiting for beacon response)
- var/destination // destination description tag
- var/next_destination // the next destination in the patrol route
- var/list/path = new // list of path turfs
-
- var/blockcount = 0 //number of times retried a blocked path
- var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
-
- var/nearest_beacon // the nearest beacon's tag
- var/turf/nearest_beacon_loc // the nearest beacon's location
+ /obj/item/weapon/gun/energy/laser/practice,\
+ /obj/item/weapon/melee/telebaton,\
+ /obj/item/weapon/gun/energy/kinetic_accelerator)
/obj/machinery/bot/secbot/beepsky
@@ -68,7 +46,7 @@
/obj/machinery/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- declare_arrests = 0
+ radio_frequency = AIPRIV_FREQ
/obj/item/weapon/secbot_assembly
name = "incomplete securitron assembly"
@@ -83,30 +61,38 @@
/obj/machinery/bot/secbot/New()
..()
- src.icon_state = "secbot[src.on]"
+ icon_state = "secbot[on]"
spawn(3)
- src.botcard = new /obj/item/weapon/card/id(src)
- var/datum/job/detective/J = new /datum/job/detective
- src.botcard.access = J.get_access()
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
+
+ var/datum/job/detective/J = new/datum/job/detective
+ botcard.access = J.get_access()
+ prev_access = botcard.access
+ add_to_beacons(bot_filter)
/obj/machinery/bot/secbot/turn_on()
..()
- src.icon_state = "secbot[src.on]"
- src.updateUsrDialog()
+ icon_state = "secbot[on]"
+ updateUsrDialog()
/obj/machinery/bot/secbot/turn_off()
..()
- src.target = null
- src.oldtarget_name = null
- src.anchored = 0
- src.mode = SECBOT_IDLE
+ icon_state = "secbot[on]"
+ updateUsrDialog()
+
+/obj/machinery/bot/secbot/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
walk_to(src,0)
- src.icon_state = "secbot[src.on]"
- src.updateUsrDialog()
+ last_found = world.time
+
+/obj/machinery/bot/secbot/set_custom_texts()
+
+ text_hack = "You overload [name]'s target identification system."
+ text_dehack = "You reboot [name] and restore the target identification."
+ text_dehack_fail = "[name] refuses to accept your authority!"
/obj/machinery/bot/secbot/attack_hand(mob/user as mob)
. = ..()
@@ -119,154 +105,120 @@
var/dat
dat += hack(user)
dat += text({"
+Securitron v1.6 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) dat += text({"
Arrest Unidentifiable Persons: []
Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
-
Operating Mode: []
Report Arrests[]
Auto Patrol: []"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - var/datum/browser/popup = new(user, "autosec", "Securitron v1.5.1 controls") + var/datum/browser/popup = new(user, "autosec", "Automatic Security Unit v1.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/secbot/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + + ..() switch(href_list["operation"]) if("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck + updateUsrDialog() if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() + weaponscheck = !weaponscheck + updateUsrDialog() if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() + check_records = !check_records + updateUsrDialog() if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You overload [src]'s target identification system." - else if(!src.hacked) - usr << "[src] refuses to accept your authority!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You reboot [src] and restore the target identification." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() + /obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if(src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + if(allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked." : "unlocked."]" else if(emagged) user << "ERROR" if(open) user << "Please close the access panel before locking it." else - user << "Access denied." + user << " Access denied." else ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user - src.mode = SECBOT_HUNT + target = user + mode = BOT_HUNT /obj/machinery/bot/secbot/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "secbot[src.on]" - mode = SECBOT_IDLE -/obj/machinery/bot/secbot/process() - set background = BACKGROUND_ENABLED + if(emagged == 2) + if(user) + user << " You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "secbot[on]" - if(!src.on) +/obj/machinery/bot/secbot/bot_process() + if (!..()) return switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) - // for(var/mob/O in hearers(src, null)) - // O << "[src] beeps, \"Backup requested! Suspect has evaded arrest.\"" - src.target = null - src.last_found = world.time - src.frustration = 0 - src.mode = SECBOT_IDLE + if(frustration >= 8) walk_to(src,0) + back_to_idle() + return if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "secbot-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "secbot-c" spawn(2) - src.icon_state = "secbot[src.on]" - var/mob/living/carbon/M = src.target - var/maxstuns = 4 + icon_state = "secbot[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) - if(M.stuttering < 5 && (!(HULK in M.mutations))) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 M.Stun(5) M.Weaken(5) @@ -277,396 +229,143 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - maxstuns-- - if(maxstuns <= 0) - target = null - - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 + else + back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target - // see if he got away - if((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) - src.anchored = 0 - mode = SECBOT_HUNT + // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) + back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - mode = SECBOT_ARREST - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipeties on [src.target]!") - - spawn(60) - if(get_dist(src, src.target) <= 1) - if(src.target.handcuffed) + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + 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]!") + spawn(60) + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - - if(istype(src.target,/mob/living/carbon)) + if(!target.handcuffed) target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay - - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) - else - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - if(SECBOT_ARREST) // arresting - - if(!target || target.handcuffed) - src.anchored = 0 - mode = SECBOT_IDLE - return - - - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 + playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + back_to_idle() + else + back_to_idle() return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() - - return - - -// perform a single patrol step -/obj/machinery/bot/secbot/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/secbot/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/secbot/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/secbot/proc/at_patrol_target() - find_patrol_target() - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/secbot/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/secbot/receive_signal(datum/signal/signal) - //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/bot/secbot/receive_signal([signal.debug_print()])") - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist 1)
- nearest_beacon = recv
- nearest_beacon_loc = signal.source.loc
+
+ if(BOT_ARREST)
+ if (!target)
+ anchored = 0
+ mode = BOT_IDLE
+ last_found = world.time
+ frustration = 0
+ return
+
+ if(target.handcuffed) //no target or target cuffed? back to idle.
+ back_to_idle()
+ return
+
+ if( !Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2) ) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
+ back_to_hunt()
+ return
+ else //Try arresting again if the target escapes.
+ mode = BOT_PREP_ARREST
+ anchored = 0
+
+ if(BOT_START_PATROL)
+ look_for_perp()
+ start_patrol()
+
+ if(BOT_PATROL)
+ look_for_perp()
+ bot_patrol()
+
+
return
+/obj/machinery/bot/secbot/proc/back_to_idle()
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ last_found = world.time
+ frustration = 0
+ spawn(0)
+ bot_process() //ensure bot quickly responds
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/secbot/proc/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/secbot/proc/post_signal_multiple(var/freq, var/list/keyval)
-
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- //for(var/key in keyval)
- // signal.data[key] = keyval[key]
- signal.data = keyval
- //world << "sent [key],[keyval[key]] on [freq]"
- if(signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if(signal.data["type"] == "secbot")
- frequency.post_signal(src, signal, filter = RADIO_SECBOT)
- else
- frequency.post_signal(src, signal)
-
-// signals bot status etc. to controller
-/obj/machinery/bot/secbot/proc/send_status()
- var/list/kv = list(
- "type" = "secbot",
- "name" = name,
- "loca" = loc.loc, // area
- "mode" = mode
- )
- post_signal_multiple(control_freq, kv)
-
-
-
-// calculates a path to the current destination
-// given an optional turf to avoid
-/obj/machinery/bot/secbot/proc/calc_path(var/turf/avoid = null)
- src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
- if(!src.path)
- src.path = list()
-
-
+/obj/machinery/bot/secbot/proc/back_to_hunt()
+ anchored = 0
+ frustration = 0
+ mode = BOT_HUNT
+ spawn(0)
+ bot_process() //ensure bot quickly responds
// look for a criminal in view of the bot
/obj/machinery/bot/secbot/proc/look_for_perp()
- src.anchored = 0
+ anchored = 0
for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if((C.stat) || (C.handcuffed))
continue
- if((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
+ if((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- src.threatlevel = C.assess_threat(src)
+ threatlevel = C.assess_threat(src)
- if(!src.threatlevel)
+ if(!threatlevel)
continue
- else if(src.threatlevel >= 4)
- src.target = C
- src.oldtarget_name = C.name
- src.speak("Level [src.threatlevel] infraction alert!")
- playsound(src.loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
- src.visible_message("[src] points at [C.name]!")
- mode = SECBOT_HUNT
+ else if(threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
spawn(0)
- process() // ensure bot quickly responds to a perp
+ bot_process() // ensure bot quickly responds to a perp
break
else
continue
-
/obj/machinery/bot/secbot/proc/check_for_weapons(var/obj/item/slot_item)
if(istype(slot_item, /obj/item/weapon/gun) || istype(slot_item, /obj/item/weapon/melee))
if(!(slot_item.type in safe_weapons))
return 1
return 0
-/obj/machinery/bot/secbot/Bump(M as mob|obj) //Leave no door unopened!
- if((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
- var/obj/machinery/door/D = M
- if(!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
- D.open()
- src.frustration = 0
- else if((istype(M, /mob/living/)) && (!src.anchored))
- src.loc = M:loc
- src.frustration = 0
- return
-
-/* terrible
-/obj/machinery/bot/secbot/Bumped(atom/movable/M as mob|obj)
- spawn(0)
- if(M)
- var/turf/T = get_turf(src)
- M:loc = T
-*/
-
/obj/machinery/bot/secbot/explode()
walk_to(src,0)
- src.visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
Sa.build_step = 1
Sa.overlays += "hs_hole"
- Sa.created_name = src.name
+ Sa.created_name = name
new /obj/item/device/assembly/prox_sensor(Tsec)
new /obj/item/weapon/melee/baton(Tsec)
@@ -677,14 +376,14 @@ Auto Patrol: []"},
s.set_up(3, 1, src)
s.start()
- new /obj/effect/decal/cleanable/oil(src.loc)
+ new /obj/effect/decal/cleanable/oil(loc)
qdel(src)
/obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
if(!isalien(target))
- src.target = user
- src.mode = SECBOT_HUNT
+ target = user
+ mode = BOT_HUNT
//Secbot Construction
@@ -694,7 +393,7 @@ Auto Patrol: []"},
..()
return
- if(src.type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
+ if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
return
if(S.secured)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 0bd36e3f74e..b76e33dad0b 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -76,14 +76,15 @@
emped = emped+1 //Increase the number of consecutive EMP's
var/thisemp = emped //Take note of which EMP this proc is for
spawn(900)
- if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
- network = previous_network
- icon_state = initial(icon_state)
- stat &= ~EMPED
- cancelCameraAlarm()
- if(can_use())
- cameranet.addCamera(src)
- emped = 0 //Resets the consecutive EMP count
+ if(loc) //qdel limbo
+ if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
+ network = previous_network
+ icon_state = initial(icon_state)
+ stat &= ~EMPED
+ cancelCameraAlarm()
+ if(can_use())
+ cameranet.addCamera(src)
+ emped = 0 //Resets the consecutive EMP count
for(var/mob/O in mob_list)
if (O.client && O.client.eye == src)
O.unset_machine()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 1a11545a0f0..34564627552 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -93,6 +93,7 @@
/obj/item/weapon/implant/health
name = "health implant"
+ activated = 0
var/healthstring = ""
/obj/item/weapon/implant/health/proc/sensehealth()
@@ -111,7 +112,7 @@
/obj/machinery/clonepod/attack_paw(mob/user as mob)
return attack_hand(user)
/obj/machinery/clonepod/attack_hand(mob/user as mob)
- if ((isnull(src.occupant)) || (stat & NOPOWER))
+ if (isnull(src.occupant) || !is_operational())
return
if ((!isnull(src.occupant)) && (src.occupant.stat != 2))
var/completion = (100 * ((src.occupant.health + 100) / (src.heal_level + 100)))
@@ -204,7 +205,7 @@
//Grow clones to maturity then kick them out. FREELOADERS
/obj/machinery/clonepod/process()
- if(stat & NOPOWER) //Autoeject if power is lost
+ if(!is_operational()) //Autoeject if power is lost
if (src.occupant)
src.locked = 0
src.go_out()
@@ -301,7 +302,7 @@
if(!usr)
return
- if (usr.stat != 0)
+ if(usr.stat || !usr.canmove || usr.restrained())
return
src.go_out()
add_fingerprint(usr)
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index dbba680f885..e7a8f509cd9 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -281,25 +281,22 @@
// Holographic Items!
-/turf/simulated/floor/holofloor/
+/turf/simulated/floor/holofloor
thermal_conductivity = 0
/turf/simulated/floor/holofloor/grass
gender = PLURAL
name = "lush grass"
icon_state = "grass1"
- floor_tile = new/obj/item/stack/tile/grass
+ floor_tile = /obj/item/stack/tile/grass
- New()
- floor_tile.New() //I guess New() isn't run on objects spawned without the definition of a turf to house them, ah well.
- icon_state = "grass[pick("1","2","3","4")]"
- ..()
- spawn(4)
+/turf/simulated/floor/holofloor/grass/New()
+ ..()
+ icon_state = "grass[pick("1","2","3","4")]"
+ spawn(1)
+ if(src)
update_icon()
- for(var/direction in cardinal)
- if(istype(get_step(src,direction),/turf/simulated/floor))
- var/turf/simulated/floor/FF = get_step(src,direction)
- FF.update_icon() //so siding get updated properly
+ fancy_update(type)
/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob)
return
@@ -456,7 +453,7 @@
visible_message(" [user] dunks [W] into the [src]!", 3)
return
-/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0)
if (istype(mover,/obj/item) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
@@ -468,7 +465,7 @@
visible_message(" \the [I] bounces off of \the [src]'s rim!", 3)
return 0
else
- return ..(mover, target, height, air_group)
+ return ..(mover, target, height)
/obj/machinery/readybutton
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 959e93bec35..dbb47efeab8 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -233,6 +233,7 @@ That prevents a few funky behaviors.
new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location.
T.aiRestorePowerRoutine = 0//So the AI initially has power.
T.control_disabled = 1//Can't control things remotely if you're stuck in a card!
+ T.radio_enabled = 0 //No talking on the built-in radio for you either!
T.loc = C//Throw AI into the card.
C.name = "inteliCard - [T.name]"
if (T.stat == 2)
@@ -259,6 +260,7 @@ That prevents a few funky behaviors.
new /obj/structure/AIcore/deactivated(T.loc)
T.aiRestorePowerRoutine = 0
T.control_disabled = 1
+ T.radio_enabled = 0
T.loc = C
C.AI = T
T.cancel_camera()
@@ -273,6 +275,7 @@ That prevents a few funky behaviors.
var/mob/living/silicon/ai/A = locate() in C//I love locate(). Best proc ever.
if(A)//If AI exists on the card. Else nothing since both are empty.
A.control_disabled = 0
+ A.radio_enabled = 1
A.loc = T.loc//To replace the terminal.
C.icon_state = "aicard"
C.name = "inteliCard"
@@ -286,6 +289,7 @@ That prevents a few funky behaviors.
var/mob/living/silicon/ai/A = C.AI
if(A)
A.control_disabled = 0
+ A.radio_enabled = 1
C.AI = null
A.loc = T.loc
A.cancel_camera()
@@ -307,6 +311,7 @@ That prevents a few funky behaviors.
A.loc = T
T.occupier = A
A.control_disabled = 1
+ A.radio_enabled = 0
if (A.stat == 2)
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-404")
else
@@ -347,6 +352,7 @@ That prevents a few funky behaviors.
T.occupier = A
C.AI = null
A.control_disabled = 1
+ A.radio_enabled = 0
T.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
T.overlays -= image('icons/obj/computer.dmi', "ai-fixer-empty")
A.cancel_camera()
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 6b5ad607a94..e7d1b3e7c67 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -23,8 +23,11 @@
/obj/item/toy/prize/mauler = 1,
/obj/item/toy/prize/odysseus = 1,
/obj/item/toy/prize/phazon = 1,
+ /obj/item/toy/prize/reticence = 1,
/obj/item/toy/cards/deck = 2,
- /obj/item/toy/nuke = 2
+ /obj/item/toy/nuke = 2,
+ /obj/item/toy/minimeteor = 2,
+ /obj/item/toy/carpplushie = 2
)
/obj/machinery/computer/arcade/New()
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 31be4f0c434..0aa6ed942bc 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -20,9 +20,6 @@
/obj/machinery/computer/security/attack_hand(var/mob/user as mob)
if(!stat)
- if (src.z > 6)
- user << "Unable to establish a connection: \black You're too far away from the station!"
- return
if (!network)
ERROR("A computer lacks a network at [x],[y],[z].")
@@ -36,6 +33,8 @@
var/list/L = list()
for (var/obj/machinery/camera/C in cameranet.cameras)
+ if((z > 7 || C.z > 7) && (C.z != z))//if on away mission, can only recieve feed from same z_level cameras
+ continue
L.Add(C)
camera_sort(L)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 6fbba86fd4d..5d49b12a1e5 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -54,12 +54,12 @@
// Try to find a scanner in that direction
scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir))
- // If found, then we break, and return the scanner
- if (!isnull(scannerf))
- break
+ // If found and operational, return the scanner
+ if (!isnull(scannerf) && scannerf.is_operational())
+ return scannerf
// If no scanner was found, it will return null
- return scannerf
+ return null
/obj/machinery/computer/cloning/proc/findcloner()
var/obj/machinery/clonepod/podf = null
@@ -68,10 +68,10 @@
podf = locate(/obj/machinery/clonepod, get_step(src, dir))
- if (!isnull(podf))
- break
+ if (!isnull(podf) && podf.is_operational())
+ return podf
- return podf
+ return null
/obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
@@ -233,25 +233,25 @@
if("stopautoprocess")
autoprocess = 0
- else if ((href_list["scan"]) && (!isnull(src.scanner)))
+ else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
scantemp = ""
loading = 1
src.updateUsrDialog()
spawn(20)
- src.scan_mob(src.scanner.occupant)
+ src.scan_mob(scanner.occupant)
loading = 0
src.updateUsrDialog()
//No locking an open scanner.
- else if ((href_list["lock"]) && (!isnull(src.scanner)))
- if ((!src.scanner.locked) && (src.scanner.occupant))
- src.scanner.locked = 1
+ else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
+ if ((!scanner.locked) && (scanner.occupant))
+ scanner.locked = 1
else
- src.scanner.locked = 0
+ scanner.locked = 0
else if(href_list["view_rec"])
src.active_record = find_record("id", href_list["view_rec"], records)
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index c4e52d403ad..f68c7bf7c36 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -34,6 +34,37 @@
proc/crewmonitor(mob/user,var/atom/source)
+ var/jobs[0]
+ jobs["Captain"] = 00
+ jobs["Head of Personnel"] = 50
+ jobs["Head of Security"] = 10
+ jobs["Warden"] = 11
+ jobs["Security Officer"] = 12
+ jobs["Detective"] = 13
+ jobs["Chief Medical Officer"] = 20
+ jobs["Chemist"] = 21
+ jobs["Geneticist"] = 22
+ jobs["Virologist"] = 23
+ jobs["Medical Doctor"] = 24
+ jobs["Research Director"] = 30
+ jobs["Scientist"] = 31
+ jobs["Roboticist"] = 32
+ jobs["Chief Engineer"] = 40
+ jobs["Station Engineer"] = 41
+ jobs["Atmospheric Technician"] = 42
+ jobs["Quartermaster"] = 51
+ jobs["Shaft Miner"] = 52
+ jobs["Cargo Technician"] = 53
+ jobs["Bartender"] = 61
+ jobs["Chef"] = 62
+ jobs["Botanist"] = 63
+ jobs["Librarian"] = 64
+ jobs["Chaplain"] = 65
+ jobs["Clown"] = 66
+ jobs["Mime"] = 67
+ jobs["Janitor"] = 68
+ jobs["Assistant"] = 99 //Unknowns/custom jobs should appear after civilians, and before assistants
+
var/t = "
"
+ //Chatroom Logs
+ if(5)
+
+ var/index = 0
+ //var/sender = "Anon"
+ //var/channel = "ss13"
+ //var/message = "Blank"
+ dat += "Back - Refresh
" + dat += "
"
+
message = defaultmsg
//user << browse(dat, "window=message;size=700x700")
//onclose(user, "message")
@@ -321,6 +341,14 @@
if(auth)
src.linkedServer.rc_msgs = list()
message = "NOTICE: Logs cleared."
+ //Clears the chatroom logs - KEY REQUIRED
+ if (href_list["clearc"])
+ if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.linkedServer.chat_msgs = list()
+ message = "NOTICE: Logs cleared."
//Change the password - KEY REQUIRED
if (href_list["pass"])
if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -464,6 +492,13 @@
else
if(auth)
src.screen = 4
+ //Chatroom Logs - KEY REQUIRED
+ if(href_list["viewc"])
+ if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.screen = 5
//usr << href_list["select"]
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 12bccdebc53..1b9c7ca9682 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -92,8 +92,10 @@
R << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered."
R.ResetSecurityCodes()
else
- message_admins("[key_name_admin(usr)] detonated [R.name]!")
- log_game("\[key_name(usr)] detonated [R.name]!")
+ message_admins("[key_name(usr, usr.client)](JMP) detonated [key_name(R, R.client)](JMP)!")
+ log_game("\[key_name(usr)] detonated [key_name(R)]!")
+ if(R.connected_ai)
+ R.connected_ai << "
ALERT - Cyborg detonation detected: [R.name]
" R.self_destruct() else usr << "Access Denied." @@ -104,10 +106,12 @@ if(can_control(usr, R)) var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") - log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") + message_admins("[key_name(usr, usr.client)](JMP) [R.canmove ? "locked down" : "released"] [key_name(R, R.client)](JMP)!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + if(R.connected_ai) + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ad296e20065..3372945212b 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -122,7 +122,7 @@ for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) var/crimstat = "" for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])) + if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"])) crimstat = E.fields["criminal"] var/background switch(crimstat) @@ -413,8 +413,10 @@ What a mess.*/ temp += "No" if ("Purge All Records") + investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records") for(var/datum/data/record/R in data_core.security) del(R) + data_core.security.Cut() temp = "All Security records deleted." if ("Add Entry") @@ -460,6 +462,7 @@ What a mess.*/ screen = 3 if ("New Record (General)") + //General Record var/datum/data/record/G = new /datum/data/record() G.fields["name"] = "New Record" G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]" @@ -472,6 +475,7 @@ What a mess.*/ data_core.general += G active1 = G + //Security Record var/datum/data/record/R = new /datum/data/record() R.fields["name"] = active1.fields["name"] R.fields["id"] = active1.fields["id"] @@ -483,7 +487,7 @@ What a mess.*/ data_core.security += R active2 = R - //Medical Record + //Medical Record var/datum/data/record/M = new /datum/data/record() M.fields["id"] = active1.fields["id"] M.fields["name"] = active1.fields["name"] @@ -506,13 +510,17 @@ What a mess.*/ if ("Edit Field") var/a1 = active1 var/a2 = active2 + switch(href_list["field"]) if("name") - if (istype(active1, /datum/data/record)) + if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record)) var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return - active1.fields["name"] = t1 + if(istype(active1, /datum/data/record)) + active1.fields["name"] = t1 + if(istype(active2, /datum/data/record)) + active2.fields["name"] = t1 if("id") if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record)) var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) @@ -607,6 +615,7 @@ What a mess.*/ if ("Change Criminal Status") if (active2) + var/old_field = active2.fields["criminal"] switch(href_list["criminal2"]) if("none") active2.fields["criminal"] = "None" @@ -618,19 +627,27 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records") if ("Delete Record (Security) Execute") + investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") if (active2) + data_core.security -= active2 del(active2) if ("Delete Record (ALL) Execute") if (active1) + investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") for(var/datum/data/record/R in data_core.medical) if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) + data_core.medical -= R del(R) - else + break + data_core.general -= active1 del(active1) + if (active2) + data_core.security -= active2 del(active2) else temp = "This function does not appear to be working at the moment. Our apologies." diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 414bd7a56f2..2f8881e4c4c 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -38,8 +38,9 @@ log_game("[user.ckey]([user]) has authorized early shuttle launch in ([x],[y],[z])") minor_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early",null,1) else - message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP)",0,1) - log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z])") + var/time = emergency_shuttle.timeleft() + message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) + log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") minor_announce("The emergency shuttle will launch in 10 seconds",null,1) emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) @@ -62,8 +63,9 @@ if(!emagged && emergency_shuttle.location == DOCKED && user.get_active_hand() == W) switch(choice) if("Launch") - message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP)",0,1) - log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z])") + var/time = emergency_shuttle.timeleft() + message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) + log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") minor_announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:",null,1) emergency_shuttle.settimeleft( 10 ) emagged = 1 diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index e5acc1ea5af..4ea9ea6993d 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,6 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 + interact_offline = 1 layer = 4 var/on = 0 @@ -45,7 +46,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(!node) + if(!node || !is_operational()) return if(!on) updateDialog() @@ -97,11 +98,17 @@ user << "Seems empty." /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) - if(state_open == 1) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine + if(state_open) close_machine() else open_machine() + else ui_interact(user) @@ -258,7 +265,7 @@ if(state_open) icon_state = "cell-open" return - if(on) + if(on && is_operational()) if(occupant) icon_state = "cell-occupied" else @@ -266,6 +273,9 @@ else icon_state = "cell-off" +/obj/machinery/atmospherics/unary/cryo_cell/power_change() + ..() + update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 4434006a2ef..a5ca16a2368 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -114,8 +114,8 @@ for reference: qdel(src) return -/obj/structure/barricade/wooden/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. - if(air_group || (height==0)) +/obj/structure/barricade/wooden/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff. + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 @@ -235,8 +235,8 @@ for reference: src.explode() return -/obj/machinery/deployable/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. - if(air_group || (height==0)) +/obj/machinery/deployable/barrier/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff. + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a770e7a9c2e..62c86d3a5ad 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -22,7 +22,6 @@ name = "airlock" icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door_closed" - power_channel = ENVIRON var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. var/hackProof = 0 // if 1, this door can't be hacked by the AI @@ -246,7 +245,7 @@ name = "bananium airlock" desc = "Honkhonkhonk" icon = 'icons/obj/doors/Doorbananium.dmi' - var/mineral = "clown" + var/mineral = "bananium" doortype = /obj/structure/door_assembly/door_assembly_clown /obj/machinery/door/airlock/sandstone @@ -1031,7 +1030,7 @@ About the new airlock wires panel: if(locate(/mob/living) in get_turf(src)) // playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) //THE BUZZING IT NEVER STOPS -Pete spawn (60) - close() + autoclose() return crush() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 8b03d1696c5..91890d4b665 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -7,6 +7,7 @@ opacity = 1 density = 1 layer = 2.7 + power_channel = ENVIRON var/secondsElectrified = 0 var/visible = 1 @@ -74,8 +75,7 @@ ..() move_update_air(T) -/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 +/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return !opacity return !density @@ -134,6 +134,7 @@ sleep(6) open() emagged = 1 + desc = "Its access panel is smoking slightly." if(istype(src, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/A = src A.lights = 0 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4e0f21b5317..4f3c30e26bf 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -8,7 +8,6 @@ icon_state = "door_open" opacity = 0 density = 0 - power_channel = ENVIRON var/blocked = 0 var/nextstate = null @@ -111,11 +110,10 @@ flags = ON_BORDER -/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border - if(air_group) return 0 return !density else return 1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index a5f6d14aea6..fa3d6098f00 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -71,11 +71,10 @@ flick(text("[]deny", src.base_state), src) return -/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border - if(air_group) return 0 return !density else return 1 @@ -238,6 +237,7 @@ src.operating = -1 flick("[src.base_state]spark", src) sleep(6) + desc += "
Its access panel is smoking slightly." if(istype(I, /obj/item/weapon/melee/energy/blade)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 910feb64a41..7e3d588f5f5 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -38,7 +38,7 @@ var/list/doppler_arrays = list() if(!usr || !isturf(usr.loc)) return - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || !usr.canmove) return src.dir = turn(src.dir, 90) return diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 72e0126433d..c75dd415940 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -5,7 +5,7 @@ desc = "A wall-mounted flashbulb device." icon = 'icons/obj/stationobjs.dmi' icon_state = "mflash1" - var/obj/item/device/flash/bulb = null + var/obj/item/device/flash/handheld/bulb = null var/id = null var/range = 2 //this is roughly the size of brig cell var/last_flash = 0 //Don't want it getting spammed like regular flashes @@ -23,7 +23,7 @@ density = 1 /obj/machinery/flasher/New() - bulb = new /obj/item/device/flash(src) + bulb = new /obj/item/device/flash/handheld(src) /obj/machinery/flasher/power_change() if (powered() && anchored && bulb) @@ -40,13 +40,15 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user) 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.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") - bulb.loc = src.loc - bulb = null - power_change() + if(do_after(user, 30)) + 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)) + 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.drop_item() @@ -174,4 +176,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 44be02fadac..3e1b2cc3ca2 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -84,6 +84,8 @@ Class Procs: process() 'game/machinery/machine.dm' Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + is_operational() + Returns 0 if the machine is unpowered, broken or undergoing maintenance, 1 if not Compiled by Aygar */ @@ -209,6 +211,11 @@ Class Procs: add_fingerprint(usr) return 0 +/obj/machinery/proc/is_operational() + return !(stat & (NOPOWER|BROKEN|MAINT)) + +//////////////////////////////////////////////////////////////////////////////////////////// + /mob/proc/canUseTopic() //TODO: once finished, place these procs on the respective mob files return @@ -302,7 +309,7 @@ Class Procs: var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 7eb17034f64..37d65fe849d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -2,6 +2,11 @@ //################### NEWSCASTERS BE HERE! #### //###-Agouri################################### +/datum/feed_comment + var/author = "" + var/body = "" + var/time_stamp = "" + /datum/feed_message var/author ="" var/body ="" @@ -11,6 +16,9 @@ var/is_admin_message = 0 var/icon/img = null var/time_stamp = "" + var/list/datum/feed_comment/comments = list() + var/locked = 0 + var/caption = "" /datum/feed_channel var/channel_name="" @@ -29,6 +37,7 @@ src.backup_body = "" src.backup_author = "" src.img = null + src.locked = 0 /datum/feed_channel/proc/clear() src.channel_name = "" @@ -54,14 +63,16 @@ newChannel.is_admin_channel = adminChannel network_channels += newChannel -/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0) +/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1) var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = author newMsg.body = msg newMsg.time_stamp = "[worldtime2text()]" newMsg.is_admin_message = adminMessage + newMsg.locked = !allow_comments if(photo) newMsg.img = photo.img + newMsg.caption = photo.scribble for(var/datum/feed_channel/FC in network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel @@ -151,6 +162,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/c_locked=0; //Will our new channel be locked to public submissions? var/hitstaken = 0 //Death at 3 hits from an item with force>=15 var/datum/feed_channel/viewing_channel = null + var/allow_comments = 1 luminosity = 0 anchored = 1 @@ -293,6 +305,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -550,7 +576,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -728,6 +754,34 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index ab94b08d5e7..6f4a0e8cb25 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -21,6 +21,7 @@ Buildable meters #define PIPE_VOLUME_PUMP 16 #define PIPE_HEAT_EXCHANGE 17 #define PIPE_DVALVE 18 +#define PIPE_4WAYMANIFOLD 19 /obj/item/pipe name = "pipe" @@ -34,6 +35,7 @@ Buildable meters item_state = "buildpipe" w_class = 3 level = 2 + var/flipped = 0 /obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null) ..() @@ -77,6 +79,14 @@ Buildable meters src.pipe_type = PIPE_VOLUME_PUMP else if(istype(make_from, /obj/machinery/atmospherics/unary/heat_exchanger)) src.pipe_type = PIPE_HEAT_EXCHANGE + else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w)) + src.pipe_type = PIPE_4WAYMANIFOLD + + var/obj/machinery/atmospherics/trinary/triP = make_from + if(istype(triP) && triP.flipped) + src.flipped = 1 + src.dir = turn(src.dir, -45) + else src.pipe_type = pipe_type src.dir = dir @@ -108,6 +118,7 @@ Buildable meters "volume pump", \ "heat exchanger", \ "digital valve", \ + "4-way manifold", \ ) name = nlist[pipe_type+1] + " fitting" var/list/islist = list( \ @@ -130,6 +141,7 @@ Buildable meters "volumepump", \ "heunary", \ "dvalve", \ + "manifold4w", \ ) icon_state = islist[pipe_type + 1] @@ -143,17 +155,32 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 - //src.pipe_dir = get_pipe_dir() + fixdir() + + return + +/obj/item/pipe/verb/flip() + set category = "Object" + set name = "Flip Pipe" + set src in view(1) + + if ( usr.stat || usr.restrained() || !usr.canmove ) + return + + if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) + src.dir = turn(src.dir, flipped ? 45 : -45) + flipped = !flipped + return + + src.dir = turn(src.dir, -180) + + fixdir() + return /obj/item/pipe/Move() @@ -161,6 +188,8 @@ Buildable meters if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \ && (src.dir in cardinal)) src.dir = src.dir|turn(src.dir, 90) + else if ((pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) && flipped) + src.dir = turn(src.dir, 45+90) else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) if(dir==2) dir = 1 @@ -173,9 +202,14 @@ Buildable meters /obj/item/pipe/proc/get_pipe_dir() if (!dir) return 0 - var/flip = turn(dir, 180) - var/cw = turn(dir, -90) - var/acw = turn(dir, 90) + + var/direct = dir + if(flipped) + direct = turn(dir, 45) + + var/flip = turn(direct, 180) + var/cw = turn(direct, -90) + var/acw = turn(direct, 90) switch(pipe_type) if( PIPE_SIMPLE_STRAIGHT, \ @@ -188,15 +222,17 @@ Buildable meters PIPE_MVALVE, \ PIPE_DVALVE \ ) - return dir|flip + return direct|flip if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT) - return dir //dir|acw + return direct //dir|acw if(PIPE_CONNECTOR,PIPE_UVENT,PIPE_SCRUBBER,PIPE_HEAT_EXCHANGE) - return dir + return direct if(PIPE_MANIFOLD) return flip|cw|acw + if(PIPE_4WAYMANIFOLD) + return NORTH|SOUTH|EAST|WEST if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) - return dir|flip|cw + return direct|flip|cw return 0 /obj/item/pipe/proc/get_pdir() //endpoints for regular pipes @@ -231,6 +267,20 @@ Buildable meters else return 0 +/obj/item/pipe/proc/unflip(var/direction) + if(!(direction in cardinal)) + return turn(direction, 45) + + return direction + +//Helper to clean up dir +/obj/item/pipe/proc/fixdir() + if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) + if(dir==2) + dir = 1 + else if(dir==8) + dir = 4 + /obj/item/pipe/attack_self(mob/user as mob) return rotate() @@ -241,11 +291,9 @@ Buildable meters return ..() if (!isturf(src.loc)) return 1 - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 + + fixdir() + var/pipe_dir = get_pipe_dir() for(var/obj/machinery/atmospherics/M in src.loc) @@ -319,6 +367,26 @@ Buildable meters M.node3.addMember(M) M.build_network() + if(PIPE_4WAYMANIFOLD) //manifold + var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc ) + + var/turf/T = M.loc + M.level = T.intact ? 2 : 1 + M.initialize() + if (M.node1) + M.node1.initialize() + M.node1.addMember(M) + if (M.node2) + M.node2.initialize() + M.node2.addMember(M) + if (M.node3) + M.node3.initialize() + M.node3.addMember(M) + if (M.node4) + M.node4.initialize() + M.node4.addMember(M) + M.build_network() + if(PIPE_JUNCTION) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc ) P.dir = src.dir @@ -403,29 +471,16 @@ Buildable meters P.node2.initialize() P.node2.build_network() - if(PIPE_GAS_FILTER) //gas filter - var/obj/machinery/atmospherics/trinary/filter/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - if (P.node3) - P.node3.initialize() - P.node3.build_network() + if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) //Trinary stuff - if(PIPE_GAS_MIXER) //gas filter - var/obj/machinery/atmospherics/trinary/mixer/P = new(src.loc) - P.dir = dir + var/obj/machinery/atmospherics/trinary/P + if(pipe_type == PIPE_GAS_FILTER) + P = new /obj/machinery/atmospherics/trinary/filter(src.loc) + else if(pipe_type == PIPE_GAS_MIXER) + P = new /obj/machinery/atmospherics/trinary/mixer(src.loc) + + P.flipped = flipped + P.dir = unflip(dir) P.initialize_directions = pipe_dir if (pipename) P.name = pipename @@ -573,4 +628,5 @@ Buildable meters #undef PIPE_PASSIVE_GATE #undef PIPE_VOLUME_PUMP #undef PIPE_OUTLET_INJECT -#undef PIPE_DVALVE \ No newline at end of file +#undef PIPE_DVALVE +#undef PIPE_4WAYMANIFOLD \ No newline at end of file diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ee7ad2dd4d3..ddc44cc8610 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -17,6 +17,7 @@ Pipe
Bent Pipe
Manifold
+4-Way Manifold
Manual Valve
Digital Valve
Devices:
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 52e3037b635..0d8bc250c32 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -364,9 +364,9 @@ emagged = 1 on=0 - sleep(rand(60,600)) - if(!on) - on=1 + spawn(rand(60,600)) + if(!on) + on=1 ..() @@ -459,31 +459,18 @@ targets += C //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee - if(targets.len > 0) //if there are targets to shoot - - var/atom/t = pick(targets) //pick a perp from the list of targets. Targets go first because they are the most important - - if(istype(t, /mob/living)) //if a mob - var/mob/living/M = t //simple typecasting - if(M.stat != DEAD) //if the target is not dead - spawn() - popUp() //pop the turret up if it's not already up. - dir = get_dir(src, M) //even if you can't shoot, follow the target - spawn() - shootAt(M) //shoot the target, finally - - else - if(secondarytargets.len > 0) //if there are no primary targets, go for secondary targets - var/mob/t = pick(secondarytargets) - if(istype(t, /mob/living)) - if(t.stat != DEAD) - spawn() - popUp() - dir=get_dir(src, t) - shootAt(t) - else + if(!tryToShootAt(targets)) + if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets spawn() - popDown() + popDown() // no valid targets, close the cover + + +/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) + while(targets.len > 0) + var/mob/living/M = pick(targets) + targets -= M + if(target(M)) + return 1 /obj/machinery/porta_turret/proc/popUp() //pops the turret up @@ -573,15 +560,19 @@ return threatcount -/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) //shoots at a target +/obj/machinery/porta_turret/proc/target(var/mob/living/target) if(disabled) return + if(target && (target.stat != DEAD) && (!(target.lying) || emagged)) + spawn() + popUp() //pop the turret up if it's not already up. + dir = get_dir(src, target) //even if you can't shoot, follow the target + spawn() + shootAt(target) + return 1 + return - if(lasercolor && istype(target,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - if(H.lying) - return - +/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 2220eb7c732..a5006803963 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -26,8 +26,8 @@ ..() move_update_air(T) -/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height, air_group) - if(!height || air_group) return 0 +/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height) + if(!height) return 0 else return ..() /obj/machinery/shield/CanAtmosPass(var/turf/T) @@ -594,8 +594,8 @@ return -/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0)) return 1 +/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0) + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSGLASS)) return prob(20) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5e98e3eafcf..2cacd1b075e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -427,8 +427,8 @@ /obj/machinery/suit_storage_unit/container_resist() var/mob/living/user = usr if(islocked) - user.changeNext_move(100) - user.last_special = world.time + 100 + 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.)" visible_message("You see [user] kicking against the doors of the [src]!") diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index c22f5980c5f..668f94b2327 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -110,8 +110,9 @@ wires.Interact(user) if(!open_panel) if(!active) - settings(user) - return + spawn() + settings(user) + return else if(anchored) user << "The bomb is bolted to the floor!" return @@ -205,10 +206,10 @@ /obj/item/weapon/bombcore/training/proc/reset() var/obj/machinery/syndicatebomb/holder = src.loc if(istype(holder)) - holder.open_panel = 0 if(holder.wires) holder.wires.Shuffle() holder.defused = 0 + holder.open_panel = 0 holder.update_icon() holder.updateDialog() @@ -226,8 +227,10 @@ if(istype(holder)) attempts++ defusals++ - holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires...") - reset() + holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...") + sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out + if(istype(holder)) + reset() /obj/item/weapon/bombcore/badmin name = "badmin payload" diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 5f00666e819..a4c672dc38a 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -42,7 +42,7 @@ AM.loc = src.loc do_transform(AM) -/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target, height=0) if(!ishuman(mover)) // Allows items to go through, to stop them from blocking the conveyour belt. var/dir = get_dir(src, mover) if(dir == EAST) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2670407895f..3427f8a655d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -648,9 +648,16 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/weapon/storage/fancy/cigarettes = 5, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/weapon/storage/box/matches = 10, + /obj/item/weapon/lighter/random = 4, + /obj/item/weapon/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/weapon/lighter/zippo = 4) - premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1) refill_canister = /obj/item/weapon/vending_refill/cigarette @@ -715,7 +722,7 @@ icon_state = "sec" icon_deny = "sec-deny" req_access_txt = "1" - 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 = 5, + 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/normal = 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) @@ -757,7 +764,7 @@ vend_delay = 15 vend_reply = "Have an enchanted evening!" product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/staff = 2) + products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/head/wizard/yellow = 1,/obj/item/clothing/suit/wizrobe/yellow = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/staff = 2) contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave /obj/machinery/vending/autodrobe @@ -773,8 +780,7 @@ /obj/item/clothing/head/helmet/gladiator = 1,/obj/item/clothing/under/gimmick/rank/captain/suit = 1,/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/labcoat/mad = 1,/obj/item/clothing/glasses/gglasses = 1,/obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/blackskirt = 1,/obj/item/clothing/head/beret = 1, - /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1, - /obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1, + /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1, /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1, @@ -858,7 +864,7 @@ icon_state = "robotics" icon_deny = "robotics-deny" req_access_txt = "29" - products = list(/obj/item/clothing/suit/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4, + products = list(/obj/item/clothing/suit/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash/handheld = 4, /obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3, /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index fcd17eea035..1a45add5d88 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -28,6 +28,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if( state != 4 ) usr << "The washing machine cannot run in this state." return diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 7ebf0183f41..b1e60d07b28 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,21 +4,9 @@ var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) internal_damage_threshold = 50 - maint_access = 0 - //add_req_access = 0 - //operation_req_access = list(access_hos) damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" -/* -/obj/mecha/combat/range_action(target as obj|mob|turf) - if(internal_damage&MECHA_INT_CONTROL_LOST) - target = pick(view(3,target)) - if(selected_weapon) - selected_weapon.fire(target) - return -*/ - /obj/mecha/combat/melee_action(target as obj|mob|turf) if(internal_damage&MECHA_INT_CONTROL_LOST) target = safepick(oview(1,src)) @@ -26,21 +14,10 @@ if(istype(target, /mob/living)) var/mob/living/M = target if(src.occupant.a_intent == "harm") - playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if(damtype == "brute") step_away(M,src,15) - /* - if(M.stat>1) - M.gib() - melee_can_hit = 0 - if(do_after(melee_cooldown)) - melee_can_hit = 1 - return - */ if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/H = target - // if (M.health <= 0) return - var/obj/item/organ/limb/temp = H.get_organ(pick("chest", "chest", "chest", "head")) if(temp) var/update = 0 @@ -48,14 +25,17 @@ if("brute") H.Paralyse(1) update |= temp.take_damage(rand(force/2, force), 0) + playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if("fire") update |= temp.take_damage(0, rand(force/2, force)) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if("tox") + playsound(src, 'sound/effects/spray2.ogg', 50, 1) if(H.reagents) - if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) - H.reagents.add_reagent("carpotoxin", force) if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - H.reagents.add_reagent("cryptobiolin", force) + H.reagents.add_reagent("cryptobiolin", force/2) + if(H.reagents.get_reagent_amount("toxin") + force < force*2) + H.reagents.add_reagent("toxin", force/2.5) else return if(update) H.update_damage_overlays(0) @@ -66,14 +46,17 @@ if("brute") M.Paralyse(1) M.take_overall_damage(rand(force/2, force)) + playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if("fire") M.take_overall_damage(0, rand(force/2, force)) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if("tox") + playsound(src, 'sound/effects/spray2.ogg', 50, 1) if(M.reagents) - if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2) - M.reagents.add_reagent("carpotoxin", force) if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - M.reagents.add_reagent("cryptobiolin", force) + M.reagents.add_reagent("cryptobiolin", force/2) + if(M.reagents.get_reagent_amount("toxin") + force < force*2) + M.reagents.add_reagent("toxin", force/2.5) else return M.updatehealth() @@ -109,134 +92,6 @@ break return -/* -/obj/mecha/combat/proc/mega_shake(target) - if(!istype(target, /obj) && !istype(target, /mob)) return - if(istype(target, /mob)) - var/mob/M = target - M.Dizzy(3) - M.adjustBruteLoss(1) - M.updatehealth() - for (var/mob/V in viewers(src)) - V.show_message("[src.name] shakes [M] like a rag doll.") - return -*/ - -/* - if(energy>0 && can_move) - if(step(src,direction)) - can_move = 0 - spawn(step_in) can_move = 1 - if(overload) - energy = energy-2 - health-- - else - energy-- - return 1 - - return 0 -*/ -/* -/obj/mecha/combat/hear_talk(mob/M as mob, text) - ..() - if(am && M==occupant) - if(findtext(text,"")) - sam() - return - -/obj/mecha/combat/proc/sam() - if(am) - var/window = {" - - - - - -
"}
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 4cfc457473d..8b98ccf7021 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -233,164 +233,12 @@
M.AdjustStunned(-4)
M.AdjustWeakened(-4)
M.AdjustStunned(-4)
- M.Paralyse(2)
- M.Weaken(2)
- M.Stun(2)
if(M.reagents.get_reagent_amount("inaprovaline") < 5)
M.reagents.add_reagent("inaprovaline", 5)
S.chassis.use_power(S.energy_drain)
S.update_equip_info()
return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer
- name = "cable layer"
- desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path."
- icon_state = "mecha_wire"
- var/datum/event/event
- var/turf/old_turf
- var/obj/structure/cable/last_piece
- var/obj/item/stack/cable_coil/cable
- var/max_cable = 1000
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/New()
- cable = new(src)
- cable.amount = 0
- ..()
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/can_attach(obj/mecha/working/M)
- if(..())
- if(istype(M))
- return 1
- return 0
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/attach()
- ..()
- event = chassis.events.addEvent("onMove",src,"layCable")
- return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/detach()
- chassis.events.clearEvent("onMove",event)
- return ..()
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/destroy()
- chassis.events.clearEvent("onMove",event)
- return ..()
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(var/obj/item/stack/cable_coil/target)
- if(!action_checks(target))
- return
- var/result = load_cable(target)
- var/message
- if(isnull(result))
- message = "Unable to load [target] - no cable found."
- else if(!result)
- message = "Reel is full."
- else
- message = "[result] meters of cable successfully loaded."
- send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
- occupant_message(message)
- return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/Topic(href,href_list)
- ..()
- if(href_list["toggle"])
- set_ready_state(!equip_ready)
- occupant_message("[src] [equip_ready?"dea":"a"]ctivated.")
- log_message("[equip_ready?"Dea":"A"]ctivated.")
- return
- if(href_list["cut"])
- if(cable && cable.amount)
- var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1)
- m = min(m, cable.amount)
- if(m)
- use_cable(m)
- var/obj/item/stack/cable_coil/CC = new (get_turf(chassis))
- CC.amount = m
- else
- occupant_message("There's no more cable on the reel.")
- return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/get_equip_info()
- var/output = ..()
- if(output)
- return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]"
- return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(var/obj/item/stack/cable_coil/CC)
- if(istype(CC) && CC.amount)
- var/cur_amount = cable? cable.amount : 0
- var/to_load = max(max_cable - cur_amount,0)
- if(to_load)
- to_load = min(CC.amount, to_load)
- if(!cable)
- cable = new(src)
- cable.amount = 0
- cable.amount += to_load
- CC.use(to_load)
- return to_load
- else
- return 0
- return
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/use_cable(amount)
- if(!cable || cable.amount<1)
- set_ready_state(1)
- occupant_message("Cable depleted, [src] deactivated.")
- log_message("Cable depleted, [src] deactivated.")
- return
- if(cable.amount < amount)
- occupant_message("No enough cable to finish the task.")
- return
- cable.use(amount)
- update_equip_info()
- return 1
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/reset()
- last_piece = null
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf)
- if(istype(new_turf, /turf/simulated/floor))
- var/turf/simulated/floor/T = new_turf
- if(!T.is_plating())
- if(!T.broken && !T.burnt)
- new T.floor_tile.type(T)
- T.make_plating()
- return !new_turf.intact
-
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(var/turf/new_turf)
- if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf))
- return reset()
- var/fdirn = turn(chassis.dir,180)
- for(var/obj/structure/cable/LC in new_turf) // check to make sure there's not a cable there already
- if(LC.d1 == fdirn || LC.d2 == fdirn)
- return reset()
- if(!use_cable(1))
- return reset()
- var/obj/structure/cable/NC = new(new_turf)
- NC.cableColor("red")
- NC.d1 = 0
- NC.d2 = fdirn
- NC.updateicon()
-
- var/datum/powernet/PN
- if(last_piece && last_piece.d2 != chassis.dir)
- last_piece.d1 = min(last_piece.d2, chassis.dir)
- last_piece.d2 = max(last_piece.d2, chassis.dir)
- last_piece.updateicon()
- PN = last_piece.powernet
-
- if(!PN)
- PN = new()
- powernets += PN
- NC.powernet = PN
- PN.cables += NC
- NC.mergeConnectedNetworks(NC.d2)
-
- //NC.mergeConnectedNetworksOnTurf()
- last_piece = NC
- return 1
-
/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
name = "exosuit syringe gun"
desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur."
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 70051b606d6..e646edb306d 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -214,8 +214,8 @@
range = MELEE|RANGED
/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/New()
- create_reagents(200)
- reagents.add_reagent("water", 200)
+ create_reagents(1000)
+ reagents.add_reagent("water", 1000)
..()
return
@@ -226,7 +226,7 @@
if(do_after_cooldown(target))
if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1)
var/obj/o = target
- o.reagents.trans_to(src, 200)
+ o.reagents.trans_to(src, 1000)
occupant_message("Extinguisher refilled.")
playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6)
else
@@ -379,6 +379,153 @@
return "[..()] \[D|C|A\]"
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer
+ name = "cable layer"
+ desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path."
+ icon_state = "mecha_wire"
+ var/datum/event/event
+ var/turf/old_turf
+ var/obj/structure/cable/last_piece
+ var/obj/item/stack/cable_coil/cable
+ var/max_cable = 1000
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/New()
+ cable = new(src)
+ cable.amount = 0
+ ..()
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/can_attach(obj/mecha/working/M)
+ if(..())
+ if(istype(M))
+ return 1
+ return 0
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/attach()
+ ..()
+ event = chassis.events.addEvent("onMove",src,"layCable")
+ return
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/detach()
+ chassis.events.clearEvent("onMove",event)
+ return ..()
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/destroy()
+ chassis.events.clearEvent("onMove",event)
+ return ..()
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(var/obj/item/stack/cable_coil/target)
+ if(!action_checks(target))
+ return
+ var/result = load_cable(target)
+ var/message
+ if(isnull(result))
+ message = "Unable to load [target] - no cable found."
+ else if(!result)
+ message = "Reel is full."
+ else
+ message = "[result] meters of cable successfully loaded."
+ send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+ occupant_message(message)
+ return
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/Topic(href,href_list)
+ ..()
+ if(href_list["toggle"])
+ set_ready_state(!equip_ready)
+ occupant_message("[src] [equip_ready?"dea":"a"]ctivated.")
+ log_message("[equip_ready?"Dea":"A"]ctivated.")
+ return
+ if(href_list["cut"])
+ if(cable && cable.amount)
+ var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1)
+ m = min(m, cable.amount)
+ if(m)
+ use_cable(m)
+ var/obj/item/stack/cable_coil/CC = new (get_turf(chassis))
+ CC.amount = m
+ else
+ occupant_message("There's no more cable on the reel.")
+ return
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/get_equip_info()
+ var/output = ..()
+ if(output)
+ return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]"
+ return
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(var/obj/item/stack/cable_coil/CC)
+ if(istype(CC) && CC.amount)
+ var/cur_amount = cable? cable.amount : 0
+ var/to_load = max(max_cable - cur_amount,0)
+ if(to_load)
+ to_load = min(CC.amount, to_load)
+ if(!cable)
+ cable = new(src)
+ cable.amount = 0
+ cable.amount += to_load
+ CC.use(to_load)
+ return to_load
+ else
+ return 0
+ return
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/use_cable(amount)
+ if(!cable || cable.amount<1)
+ set_ready_state(1)
+ occupant_message("Cable depleted, [src] deactivated.")
+ log_message("Cable depleted, [src] deactivated.")
+ return
+ if(cable.amount < amount)
+ occupant_message("No enough cable to finish the task.")
+ return
+ cable.use(amount)
+ update_equip_info()
+ return 1
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/reset()
+ last_piece = null
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf)
+ if(istype(new_turf, /turf/simulated/floor))
+ var/turf/simulated/floor/T = new_turf
+ if(!istype(T, /turf/simulated/floor/plating))
+ if(!T.broken && !T.burnt)
+ new T.floor_tile(T)
+ T.make_plating()
+ return !new_turf.intact
+
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(var/turf/new_turf)
+ if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf))
+ return reset()
+ var/fdirn = turn(chassis.dir,180)
+ for(var/obj/structure/cable/LC in new_turf) // check to make sure there's not a cable there already
+ if(LC.d1 == fdirn || LC.d2 == fdirn)
+ return reset()
+ if(!use_cable(1))
+ return reset()
+ var/obj/structure/cable/NC = new(new_turf)
+ NC.cableColor("red")
+ NC.d1 = 0
+ NC.d2 = fdirn
+ NC.updateicon()
+
+ var/datum/powernet/PN
+ if(last_piece && last_piece.d2 != chassis.dir)
+ last_piece.d1 = min(last_piece.d2, chassis.dir)
+ last_piece.d2 = max(last_piece.d2, chassis.dir)
+ last_piece.updateicon()
+ PN = last_piece.powernet
+
+ if(!PN)
+ PN = new()
+ powernets += PN
+ NC.powernet = PN
+ PN.cables += NC
+ NC.mergeConnectedNetworks(NC.d2)
+
+ //NC.mergeConnectedNetworksOnTurf()
+ last_piece = NC
+ return 1
/obj/item/mecha_parts/mecha_equipment/teleporter
@@ -869,8 +1016,8 @@
var/coeff = 100
var/obj/item/stack/sheet/fuel
var/max_fuel = 150000
- var/fuel_per_cycle_idle = 100
- var/fuel_per_cycle_active = 500
+ var/fuel_per_cycle_idle = 25
+ var/fuel_per_cycle_active = 200
var/power_per_cycle = 20
reliability = 1000
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 23417f8f67b..53e3d9ed383 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -3,6 +3,8 @@
icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port
icon_state = "recharge_floor" // Some people just want to watch the world burn i guess
+/turf/simulated/floor/mech_bay_recharge_floor/break_tile()
+ src.ChangeTurf(/turf/simulated/floor/plating)
/turf/simulated/floor/mech_bay_recharge_floor/airless
icon_state = "recharge_floor_asteroid"
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 0447d2cd81e..5e844cdcdf7 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -49,6 +49,7 @@
),
"Ripley"=list(
/obj/item/mecha_parts/chassis/ripley,
+ /obj/item/mecha_parts/chassis/firefighter,
/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_left_arm,
/obj/item/mecha_parts/part/ripley_right_arm,
@@ -93,7 +94,17 @@
/obj/item/mecha_parts/part/honker_right_arm,
/obj/item/mecha_parts/part/honker_left_leg,
/obj/item/mecha_parts/part/honker_right_leg
- ),
+ ),
+ "Phazon"=list(
+ /obj/item/mecha_parts/chassis/phazon,
+ /obj/item/mecha_parts/part/phazon_torso,
+ /obj/item/mecha_parts/part/phazon_head,
+ /obj/item/mecha_parts/part/phazon_left_arm,
+ /obj/item/mecha_parts/part/phazon_right_arm,
+ /obj/item/mecha_parts/part/phazon_left_leg,
+ /obj/item/mecha_parts/part/phazon_right_leg,
+ /obj/item/mecha_parts/part/phazon_armor
+ ),
"Exosuit Equipment"=list(
/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,
/obj/item/mecha_parts/mecha_equipment/tool/drill,
@@ -101,8 +112,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,
/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,
- /obj/item/mecha_parts/chassis/firefighter,
- ///obj/item/mecha_parts/mecha_equipment/repair_droid,
+ /obj/item/mecha_parts/mecha_equipment/repair_droid,
/obj/item/mecha_parts/mecha_equipment/generator,
///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING
/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
@@ -729,17 +739,19 @@
return 0
var/result = 0
var/obj/item/stack/sheet/res = new type(src)
- var/total_amount = round(resources[mat_string]/MINERAL_MATERIAL_AMOUNT)
- res.amount = min(total_amount,res.max_amount)
- if(res.amount>0)
+ if(amount>0 && amount<=50)
+ var/total_amount = round(resources[mat_string]/MINERAL_MATERIAL_AMOUNT)
+ res.amount = min(amount,total_amount)
resources[mat_string] -= res.amount*MINERAL_MATERIAL_AMOUNT
res.Move(src.loc)
result = res.amount
else
+ result = 0
qdel(res)
return result
+
/obj/machinery/mecha_part_fabricator/attackby(obj/W as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W))
return
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index a412f5d0e60..ca60fecf420 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -32,7 +32,7 @@
var/list/log = new
var/last_message = 0
var/add_req_access = 1
- var/maint_access = 1
+ var/maint_access = 0
var/dna //dna-locking the mech
var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
var/datum/effect/effect/system/spark_spread/spark_system = new
@@ -57,7 +57,6 @@
var/list/internals_req_access = list(access_engine,access_robotics)//required access level to open cell compartment
var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature
- var/datum/global_iterator/pr_inertial_movement //controls intertial movement in spesss
var/datum/global_iterator/pr_give_air //moves air from tank to cabin
var/datum/global_iterator/pr_internal_damage //processes internal damage
@@ -86,7 +85,6 @@
add_cell()
add_iterators()
removeVerb(/obj/mecha/verb/disconnect_from_port)
- removeVerb(/atom/movable/verb/pull)
log_message("[src.name] created.")
mechas_list += src //global mech list
return
@@ -130,12 +128,10 @@
internal_tank = null
qdel(pr_int_temp_processor)
- qdel(pr_inertial_movement)
qdel(pr_give_air)
qdel(pr_internal_damage)
qdel(spark_system)
pr_int_temp_processor = null
- pr_inertial_movement = null
pr_give_air = null
pr_internal_damage = null
spark_system = null
@@ -183,7 +179,6 @@
/obj/mecha/proc/add_iterators()
pr_int_temp_processor = new /datum/global_iterator/mecha_preserve_temp(list(src))
- pr_inertial_movement = new /datum/global_iterator/mecha_intertial_movement(null,0)
pr_give_air = new /datum/global_iterator/mecha_tank_give_air(list(src))
pr_internal_damage = new /datum/global_iterator/mecha_internal_damage(list(src),0)
@@ -205,13 +200,13 @@
return 1
-
-
-/obj/mecha/proc/check_for_support()
- if(locate(/obj/structure/grille, orange(1, src)) || locate(/obj/structure/lattice, orange(1, src)) || locate(/turf/simulated, orange(1, src)) || locate(/turf/unsimulated, orange(1, src)))
- return 1
- else
+obj/mecha/proc/can_use(mob/user)
+ if(user != src.occupant)
return 0
+ if(user && ismob(user))
+ if(!usr.stat && !usr.restrained() && usr.canmove)
+ return 1
+ return 0
/obj/mecha/examine(mob/user)
..()
@@ -304,11 +299,15 @@
//////// Movement procs ////////
//////////////////////////////////
-/obj/mecha/Move()
+/obj/mecha/Move(atom/newloc, direct)
. = ..()
if(.)
events.fireEvent("onMove",get_turf(src))
- return
+
+/obj/mecha/Process_Spacemove(var/movement_dir = 0)
+ if(occupant)
+ return occupant.Process_Spacemove(movement_dir) //We'll just say you used the clamp to grab the wall
+ return ..()
/obj/mecha/relaymove(mob/user,direction)
if(user != src.occupant) //While not "realistic", this piece is player friendly.
@@ -331,7 +330,7 @@
/obj/mecha/proc/dyndomove(direction)
if(!can_move)
return 0
- if(pr_inertial_movement && src.pr_inertial_movement.active())
+ if(!Process_Spacemove(direction))
return 0
if(!has_charge(step_energy_drain))
return 0
@@ -341,14 +340,9 @@
else if(src.dir!=direction)
move_result = mechturn(direction)
else
- move_result = mechstep(direction)
+ move_result = mechstep(direction)
if(move_result)
can_move = 0
- use_power(step_energy_drain)
- if(istype(src.loc, /turf/space))
- if(!src.check_for_support() && pr_inertial_movement)
- src.pr_inertial_movement.start(list(src,direction))
- src.log_message("Movement control lost. Inertial movement started.")
if(do_after(step_in))
can_move = 1
return 1
@@ -468,9 +462,10 @@
if ((HULK in user.mutations) && !prob(src.deflect_chance))
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
- user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.")
+ user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.")
+ src.occupant_message("[user] hits [src.name], doing some damage.")
else
- user.visible_message("[user] hits [src.name]. Nothing happens","You hit [src.name] with no visible effect.")
+ user.visible_message("[user] hits [src.name]. Nothing happens","You hit [src.name] with no visible effect.")
src.log_append_to_last("Armor saved.")
return
@@ -480,12 +475,14 @@
/obj/mecha/attack_alien(mob/user as mob)
src.log_message("Attack by alien. Attacker - [user].",1)
+ user.changeNext_move(CLICK_CD_MELEE) //Now stompy alien killer mechs are actually scary to aliens!
if(!prob(src.deflect_chance))
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
user << "You slash at the armored suit!"
visible_message("The [user] slashes at [src.name]'s armor!")
+ src.occupant_message("The [user] slashes at [src.name]'s armor!")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
@@ -504,12 +501,13 @@
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
src.take_damage(damage)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
- visible_message("[user] [user.attacktext] [src]!")
+ visible_message("[user] [user.attacktext] [src]!")
+ src.occupant_message("[user] [user.attacktext] [src]!")
add_logs(user, src, "attacked", admin=0)
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- src.occupant_message("The [user]'s attack is stopped by the armor.")
+ src.occupant_message("[user]'s attack is stopped by the armor.")
visible_message("The [user] rebounds off [src.name]'s armor!")
add_logs(user, src, "attacked", admin=0)
return
@@ -528,8 +526,8 @@
src.visible_message("The [A] fastens firmly to [src].")
return
if(prob(src.deflect_chance) || istype(A, /mob))
- src.occupant_message("The [A] bounces off the armor.")
- src.visible_message("The [A] bounces off the [src.name] armor")
+ src.occupant_message("[A] bounces off the armor.")
+ src.visible_message("[A] bounces off the [src.name] armor")
src.log_append_to_last("Armor saved.")
if(istype(A, /mob/living))
var/mob/living/M = A
@@ -537,6 +535,8 @@
else if(istype(A, /obj))
var/obj/O = A
if(O.throwforce)
+ src.occupant_message("[src.name] is hit by [A].")
+ src.visible_message("[src.name] is hit by [A].")
src.take_damage(O.throwforce)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
return
@@ -562,6 +562,8 @@
ignore_threshold = 1
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
src.take_damage(Proj.damage,Proj.flag)
+ src.occupant_message("[src.name] is hit by [Proj]!")
+ src.visible_message("[src.name] is hit by [Proj].")
src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
Proj.on_hit(src)
return
@@ -644,7 +646,7 @@
return 0
else
src.occupant_message("[user] hits [src] with [W].")
- user.visible_message("[user] hits [src] with [W].", "You hit [src] with [W].")
+ user.visible_message("[user] hits [src] with [W].", "You hit [src] with [W].")
src.take_damage(W.force,W.damtype)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
return 1
@@ -653,7 +655,7 @@
////// AttackBy //////
//////////////////////
-/obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/mecha/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/mmi))
if(mmi_move_inside(W,user))
@@ -674,7 +676,7 @@
return
if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if(add_req_access || maint_access)
- if(internals_access_allowed(usr))
+ if(internals_access_allowed(user))
var/obj/item/weapon/card/id/id_card
if(istype(W, /obj/item/weapon/card/id))
id_card = W
@@ -684,9 +686,9 @@
output_maintenance_dialog(id_card, user)
return
else
- user << "Invalid ID: Access denied."
+ user << "Invalid ID: Access denied."
else
- user << "Maintenance protocols disabled by operator."
+ user << "Maintenance protocols disabled by operator."
else if(istype(W, /obj/item/weapon/wrench))
if(state==1)
state = 2
@@ -742,19 +744,22 @@
return
else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
+ user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/weldingtool/WT = W
- if (WT.remove_fuel(0,user))
- if (hasInternalDamage(MECHA_INT_TANK_BREACH))
- clearInternalDamage(MECHA_INT_TANK_BREACH)
- user << "You repair the damaged gas tank."
- else
- return
if(src.health" - world << text + world << text diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 0f30a1af738..7e4fb0e05fd 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -5,7 +5,6 @@ required_players = 25 required_enemies = 5 recommended_enemies = 8 - pre_setup_before_jobs = 1 traitor_name = "double agent" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 2c4d9aaab5b..d1c5b769b03 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -15,7 +15,6 @@ required_players = 0 required_enemies = 1 recommended_enemies = 4 - pre_setup_before_jobs = 1 var/traitors_possible = 4 //hard limit on traitors if scaling is turned off var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. @@ -31,6 +30,9 @@ if(config.protect_roles_from_antagonist) restricted_jobs += protected_jobs + if(config.protect_assistant_from_antagonist) + restricted_jobs += "Assistant" + var/num_traitors = 1 if(config.traitor_scaling_coeff) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index e8560103ecc..1aaee715f37 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -58,7 +58,7 @@ if("doublebarrel") new /obj/item/weapon/gun/projectile/revolver/doublebarrel(get_turf(H)) if("shotgun") - new /obj/item/weapon/gun/projectile/shotgun/(get_turf(H)) + new /obj/item/weapon/gun/projectile/shotgun(get_turf(H)) if("combatshotgun") new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H)) if("mateba") diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index ef97dcc54cf..7fafb6f14f5 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -21,7 +21,7 @@ var/datum/mind/wizard = pick(antag_candidates) wizards += wizard modePlayer += wizard - wizard.need_job_assign = 0 + wizard.assigned_role = "MODE" wizard.special_role = "Wizard" if(wizardstart.len == 0) wizard.current << "A starting location for you could not be found, please report this bug!" diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index d23c954f352..4c67f3feac4 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -14,8 +14,8 @@ Assistant minimal_access = list() //See /datum/job/assistant/get_access() /datum/job/assistant/equip_items(var/mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/random(H), slot_w_uniform) /datum/job/assistant/get_access() if(config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) //Config has assistant maint access set diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 7ea6afcadf5..e7b5df5df67 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -137,7 +137,7 @@ Cargo Technician department_head = list("Head of Personnel") department_flag = CIVILIAN faction = "Station" - total_positions = 2 + total_positions = 3 spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index f45733dd62e..c0975987618 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -75,7 +75,7 @@ Roboticist department_flag = MEDSCI faction = "Station" total_positions = 2 - spawn_positions = 1 + spawn_positions = 2 supervisors = "research director" selection_color = "#ffeeff" diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 5aa5448c8c3..613b07e545c 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -84,7 +84,7 @@ Warden H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) @@ -175,7 +175,7 @@ Security Officer H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_r_store) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 57365511158..906f167875d 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -46,11 +46,6 @@ var/global/datum/controller/occupations/job_master if(!job) return 0 if(jobban_isbanned(player, rank)) return 0 if(!job.player_old_enough(player.client)) return 0 - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - return 0 - if(!player.mind.need_job_assign) - return 0 var/position_limit = job.total_positions if(!latejoin) position_limit = job.spawn_positions @@ -82,14 +77,6 @@ var/global/datum/controller/occupations/job_master Debug("FOC non-human failed, Player: [player]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("FOC player has a special role and this job is blocked from this special role") - continue - - if(!player.mind.need_job_assign) - continue - if(player.client.prefs.GetJobDepartment(job, level) & job.flag) Debug("FOC pass, Player: [player], Level:[level]") candidates += player @@ -119,13 +106,6 @@ var/global/datum/controller/occupations/job_master Debug("GRJ non-human failed, Player: [player]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("GRJ player has a special role and this job is blocked from this special role") - continue - - if(!player.mind.need_job_assign) - continue if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) Debug("GRJ Random job given, Player: [player], Job: [job]") @@ -143,7 +123,7 @@ var/global/datum/controller/occupations/job_master return -//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until� +//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until //it locates a head or runs out of levels to check //This is basically to ensure that there's atleast a few heads in the round /datum/controller/occupations/proc/FillHeadPosition() @@ -282,13 +262,6 @@ var/global/datum/controller/occupations/job_master Debug("DO non-human failed, Player: [player], Job:[job.title]") continue - if(player.mind.special_role && ticker && ticker.mode) - if(job.title in ticker.mode.restricted_jobs) - Debug("DO player has a special role and this job is blocked from that special role") - continue - - if(!player.mind.need_job_assign) - continue // If the player wants that job on this level, then try give it to him. if(player.client.prefs.GetJobDepartment(job, level) & job.flag) @@ -302,6 +275,10 @@ var/global/datum/controller/occupations/job_master // Hand out random jobs to the people who didn't get any in the last check // Also makes sure that they got their preference correct + for(var/mob/new_player/player in unassigned) + if(jobban_isbanned(player, "Assistant")) + GiveRandomJob(player) //you get to roll for random before everyone else just to be sure you don't get assistant. you're so speshul + for(var/mob/new_player/player in unassigned) if(player.client.prefs.userandomjob) GiveRandomJob(player) @@ -318,8 +295,6 @@ var/global/datum/controller/occupations/job_master //Gives the player the stuff he should have with his rank /datum/controller/occupations/proc/EquipRank(var/mob/living/H, var/rank, var/joined_late = 0) - if(!H.mind.need_job_assign) - return 0 var/datum/job/job = GetJob(rank) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c62958f84db..14bf5181d8f 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -73,7 +73,7 @@ var/list/engineering_positions = list( var/list/medical_positions = list( "Chief Medical Officer", "Medical Doctor", - "Geneticist", //Part of both medical and science + "Geneticist", "Virologist", "Chemist" ) @@ -82,7 +82,6 @@ var/list/medical_positions = list( var/list/science_positions = list( "Research Director", "Scientist", - "Geneticist", //Part of both medical and science "Roboticist" ) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f59ff9c6f1e..5bc8aeaa702 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -80,6 +80,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if(storedpda) storedpda.loc = get_turf(src.loc) storedpda = null diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7e5801c56fe..71275ae4f4b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,8 +11,9 @@ icon_state = "sleeper-open" density = 0 anchored = 1 - var/efficiency + interact_offline = 1 state_open = 1 + var/efficiency var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible @@ -132,11 +133,17 @@ open_machine() /obj/machinery/sleeper/attack_hand(mob/user) - if(stat & (BROKEN|NOPOWER)) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine if(state_open) close_machine() else open_machine() + else sleeperUI(user) @@ -233,6 +240,8 @@ ..(target) /obj/machinery/sleeper/proc/inject_chem(mob/user, chem) + if(!is_operational()) + return if(occupant && occupant.reagents) if(chem in injection_chems + "inaprovaline") if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 0467c3c3d62..f64917ebf06 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -851,7 +851,8 @@ table tr:first-child th:first-child { border: none;} else stat |= NOPOWER spawn(rand(0,15)) - update_icon() + if(loc) + update_icon() /* AIR ALARM CIRCUIT @@ -1084,10 +1085,10 @@ FIRE ALARM /obj/machinery/firealarm/power_change() if(powered(ENVIRON)) stat &= ~NOPOWER - update_icon() else - spawn(rand(0,15)) - stat |= NOPOWER + stat |= NOPOWER + spawn(rand(0,15)) + if(loc) update_icon() /obj/machinery/firealarm/attack_hand(mob/user as mob) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index cfa87d4ae4e..9345d395957 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -18,6 +18,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/airlock_electronics(), \ new /obj/item/weapon/airalarm_electronics(), \ new /obj/item/weapon/firealarm_electronics(), \ + new /obj/item/device/pipe_painter(), \ new /obj/item/stack/sheet/metal(), \ new /obj/item/stack/sheet/glass(), \ new /obj/item/stack/sheet/rglass(), \ @@ -54,7 +55,7 @@ var/global/list/autolathe_recipes = list( \ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/weapon/flamethrower/full(), \ new /obj/item/weapon/rcd(), \ - new /obj/item/device/radio/electropack(), \ + new /obj/item/device/electropack(), \ new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/weapon/restraints/handcuffs(), \ new /obj/item/ammo_box/a357(), \ @@ -246,13 +247,13 @@ var/global/list/autolathe_recipes_hidden = list( \ if(istype(template, /obj/item/stack)) src.m_amount -= template.m_amt*multiplier src.g_amount -= template.g_amt*multiplier - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) var/obj/item/stack/S = new_item S.amount = multiplier else src.m_amount -= template.m_amt/coeff src.g_amount -= template.g_amt/coeff - var/obj/new_item = new template.type(T) + var/obj/item/new_item = new template.type(T) new_item.m_amt /= coeff new_item.g_amt /= coeff if(src.m_amount < 0) @@ -286,7 +287,7 @@ var/global/list/autolathe_recipes_hidden = list( \ objs += src.L if(src.hacked) objs += src.LL - for(var/obj/t in objs) + for(var/obj/item/t in objs) if(disabled || m_amount
" - hack += "Harm Prevention Safety System: [src.emagged ? "DANGER" : "Engaged"]
" + if(issilicon(user)) //Allows silicons to toggle the emag status of a bot. + hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" + hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" + else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. + hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" return hack -/obj/machinery/bot/attack_ai(mob/user as mob) - src.attack_hand(user) +/obj/machinery/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally. + text_hack = "You hack [name]." + text_dehack = "You reset [name]." + text_dehack_fail = "You fail to reset [name]." -/obj/machinery/bot/proc/speak(var/message) - if((!src.on) || (!message)) +/obj/machinery/bot/attack_ai(mob/user as mob) + attack_hand(user) + +/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. + if((!on) || (!message)) return - for(var/mob/O in hearers(src, null)) - O.show_message("[src] beeps, \"[message]\"",2) + if(freq) + Radio.set_frequency(radio_frequency) + Radio.talk_into(src, message, radio_frequency) + else + say(message) return + //Generalized behavior code, override where needed! + +/* +scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result. +Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists, +and the view range, which defaults to 7 (full screen) if an override is not passed. +If the bot maintains an ignore list, it is also checked here. + +Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) +The proc would return a human next to the bot to be set to the patient var. +Pass the desired type path itself, declaring a temporary var beforehand is not required. +*/ +obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range) + var/final_result + for (var/scan in view (scan_range ? scan_range : DEFAULT_SCAN_RANGE, src) ) //Search for something in range! + if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! + continue //If not, keep searching! + if( !(scan in ignore_list) && !(scan in old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness + var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected. + if( scan_result ) + final_result = scan_result + else + continue //The current element failed assessment, move on to the next. + return final_result + +//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. +obj/machinery/bot/proc/process_scan(var/scan_target) + return scan_target + + +/obj/machinery/bot/proc/add_to_ignore(var/subject) + if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. + ignore_list |= subject + else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. + ignore_list -= ignore_list[1] + ignore_list |= subject + +/* +Movement proc for stepping a bot through a path generated through A-star. +Pass a positive integer as an argument to override a bot's default speed. +*/ +obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) + + if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. + path = list() + return 0 + if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again. + return 1 + var/success + var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var. + if(step_count >= 1 && tries < 4) + for(step_count, step_count >= 1,step_count--) + success = bot_step(dest) + if (success) + tries = 0 + else + tries++ + break + sleep(4) + else + return 0 + return 1 + + +obj/machinery/bot/proc/bot_step(var/dest) + if(path && path.len > 1) + step_to(src, path[1]) + if(get_turf(src) == path[1]) //Successful move + path -= path[1] + else + return 0 + else if(path.len == 1) + step_to(src, dest) + path = list() + return 1 + + +/obj/machinery/bot/proc/check_bot_access() + if(mode != BOT_SUMMON && mode != BOT_RESPONDING) + botcard.access = prev_access + +/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint) + bot_reset() //Reset a bot before setting it to call mode. + var/area/end_area = get_area(waypoint) + + //For giving the bot temporary all-access. + var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id + var/datum/job/captain/All = new/datum/job/captain + all_access.access = All.get_access() + + path = AStar(src, waypoint, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 200, id=all_access) + calling_ai = caller //Link the AI to the bot! + ai_waypoint = waypoint + + if(path && path.len) //Ensures that a valid path is calculated! + if(!on) + turn_on() //Saves the AI the hassle of having to activate a bot manually. + botcard = all_access //Give the bot all-access while under the AI's command. + calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." + pathset = 1 + mode = BOT_RESPONDING + tries = 0 + else + calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." + calling_ai = null + path = list() + +/obj/machinery/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. +//Handles the bot's movement during a call. + var/success = bot_move(ai_waypoint, 3) + if (!success) + if(calling_ai) + calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" + calling_ai = null + bot_reset() + +obj/machinery/bot/proc/bot_reset() + if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. + calling_ai << "Call command to a bot has been reset." + calling_ai = null + path = list() + summon_target = null + pathset = 0 + botcard.access = prev_access + tries = 0 + mode = BOT_IDLE + + + + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//Patrol and summon code! +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +/obj/machinery/bot/proc/bot_patrol() + patrol_step() + spawn(5) + if(mode == BOT_PATROL) + patrol_step() + return + +obj/machinery/bot/proc/start_patrol() + + if(tries >= 4) //Bot is trapped, so stop trying to patrol. + auto_patrol = 0 + tries = 0 + speak("Unable to start patrol.") + + return + + if(!auto_patrol) //A bot not set to patrol should not be patrolling. + mode = BOT_IDLE + return + + if(patrol_target) // has patrol target + spawn(0) + calc_path() // Find a route to it + if(path.len == 0) + patrol_target = 0 + return + mode = BOT_PATROL + else // no patrol target, so need a new one + find_patrol_target() + speak("Engaging patrol mode.") + tries++ + return + +// perform a single patrol step + +/obj/machinery/bot/proc/patrol_step() + + if(loc == patrol_target) // reached target + + at_patrol_target() + return + + else if(path.len > 0 && patrol_target) // valid path + var/turf/next = path[1] + if(next == loc) + path -= next + return + + + var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move + if(moved) // successful move + blockcount = 0 + + else // failed to move + blockcount++ + + if(blockcount > 5) // attempt 5 times before recomputing + // find new path excluding blocked turf + + spawn(2) + calc_path(next) + if(path.len == 0) + find_patrol_target() + else + blockcount = 0 + tries = 0 + + return + + return + + else // no path, so calculate new one + mode = BOT_START_PATROL + + return + +// finds a new patrol target +/obj/machinery/bot/proc/find_patrol_target() + send_status() + if(awaiting_beacon) // awaiting beacon response + awaiting_beacon++ + if(awaiting_beacon > 5) // wait 5 secs for beacon response + find_nearest_beacon() // then go to nearest instead + return + if(next_destination) + set_destination(next_destination) + else + + find_nearest_beacon() + return + + +// finds the nearest beacon to self +// signals all beacons matching the patrol code +/obj/machinery/bot/proc/find_nearest_beacon() + nearest_beacon = null + new_destination = "__nearest__" + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + spawn(10) + awaiting_beacon = 0 + if(nearest_beacon) + set_destination(nearest_beacon) + tries = 0 + else + auto_patrol = 0 + mode = BOT_IDLE + speak("Disengaging patrol mode.") + send_status() + + +/obj/machinery/bot/proc/at_patrol_target() + + find_patrol_target() + return + + +// sets the current destination +// signals all beacons matching the patrol code +// beacons will return a signal giving their locations +/obj/machinery/bot/proc/set_destination(var/new_dest) + new_destination = new_dest + post_signal(beacon_freq, "findbeacon", "patrol") + awaiting_beacon = 1 + + +// receive a radio signal +// used for beacon reception + +/obj/machinery/bot/receive_signal(datum/signal/signal) + //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])") + if(!on) + return +/* + if(!signal.data["beacon"]) + + for(var/x in signal.data) + world << "* [x] = [signal.data[x]]" + */ + + var/recv = signal.data["command"] + // process all-bot input + + if(recv=="bot_status") + send_status() + + // check to see if we are the commanded bot + if(signal.data["active"] == src) + if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. + return + // process control input + switch(recv) + if("stop") + bot_reset() //HOLD IT!! + auto_patrol = 0 + return + + if("go") + auto_patrol = 1 + return + + if("summon") + bot_reset() + var/list/user_access = signal.data["useraccess"] + summon_target = signal.data["target"] //Location of the user + if(user_access.len != 0) + botcard.access = user_access + prev_access //Adds the user's access, if any. + mode = BOT_SUMMON + calc_summon_path() + speak("Responding.", radio_frequency) + return + + // receive response from beacon + recv = signal.data["beacon"] + var/valid = signal.data["patrol"] + if(!recv || !valid) + return + if(recv == new_destination) // if the recvd beacon location matches the set destination + // the we will navigate there + destination = new_destination + patrol_target = signal.source.loc + next_destination = signal.data["next_patrol"] + awaiting_beacon = 0 + + // if looking for nearest beacon + else if(new_destination == "__nearest__") + var/dist = get_dist(src,signal.source.loc) + if(nearest_beacon) + // note we ignore the beacon we are located at + if(dist>1 && dist
+Cleaner v1.1 controls
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]"}, -text("[src.on ? "On" : "Off"]")) - if(!src.locked || issilicon(user)) - dat += text({"
Cleans Blood: []
"}, text("[src.blood ? "Yes" : "No"]")) - dat += text({"
Patrol station: []
"}, text("[src.should_patrol ? "Yes" : "No"]")) - // dat += text({"
Beacon frequency: []
"}, text("[src.beacon_freq]")) -/* if(src.open && !src.locked) - dat += text({" -Odd looking screw twiddled: []
-Weird button pressed: []"}, -text("[src.screwloose ? "Yes" : "No"]"), -text("[src.oddbutton ? "Yes" : "No"]"))*/ +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, +text("[on ? "On" : "Off"]")) + if(!locked || issilicon(user)) + dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]")) + dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]")) - user << browse("
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]
"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) if(!lasercolor) dat += text({"
Arrest Unidentifiable Persons: []
@@ -140,76 +131,49 @@ Arrest for Warrant: []
Operating Mode: []
Report Arrests[]
-Auto Patrol: []"}, +Auto Patrol[]"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - - var/datum/browser/popup = new(user, "autosec", "Securitron v2.0.9 controls") + var/datum/browser/popup = new(user, "autoed209", "Automatic Security Unit v2.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/ed209/Topic(href, href_list) - if (..()) - return - usr.set_machine(src) - src.add_fingerprint(usr) if(lasercolor && (istype(usr,/mob/living/carbon/human))) var/mob/living/carbon/human/H = usr if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it return else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) return - if ((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + ..() switch(href_list["operation"]) if ("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() - if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() - if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + weaponscheck = !weaponscheck + updateUsrDialog() + if ("ignorerec") + check_records = !check_records + updateUsrDialog() + if ("switchmode") + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You disable [src]'s combat inhibitor." - else if(!src.hacked) - usr << "[src] ignores your attempts to restrict it!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You restore [src]'s combat inhibitor." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() /obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked" : "unlocked"]." + if (allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked" : "unlocked"]." else if(emagged) user << "ERROR" @@ -219,92 +183,79 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && !istype(W, /obj/item/weapon/weldingtool) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. - if(hasvar(W,"force") && W.force)//If force is defined and non-zero + if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. + return + if (!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user + target = user if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + shootAt(user) + mode = BOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "[lasercolor]ed209[src.on]" - src.projectile = null - mode = SECBOT_IDLE + if(emagged == 2) + if(user) + user << "You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "[lasercolor]ed209[on]" + set_weapon() -/obj/machinery/bot/ed209/process() - set background = BACKGROUND_ENABLED - - if (!src.on || src.disabled) +/obj/machinery/bot/ed209/bot_process() + if (!..()) return + + if(disabled) + return + var/list/targets = list() - for (var/mob/living/carbon/C in view(9,src)) //Let's find us a target + for (var/mob/living/carbon/C in view(7,src)) //Let's find us a target var/threatlevel = 0 if ((C.stat) || (C.lying)) continue - if (istype(C, /mob/living/carbon/human)) - threatlevel = C.assess_threat(src, lasercolor) - //src.speak(C.real_name + text(": threat: []", threatlevel)) + threatlevel = C.assess_threat(src, lasercolor) + //speak(C.real_name + text(": threat: []", threatlevel)) if (threatlevel < 4 ) continue var/dst = get_dist(src, C) - if ( dst <= 1 || dst > 12) + if ( dst <= 1 || dst > 7) continue targets += C if (targets.len>0) - var/mob/t = pick(targets) - if (istype(t, /mob/living)) - if ((t.stat!=2) && (t.lying != 1)) - //src.speak("selected target: " + t.real_name) - src.shootAt(t) + var/mob/living/carbon/t = pick(targets) + if ((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. + shootAt(t) switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - look_for_perp() // see if any criminals are in range + if(!lasercolor) //lasertag bots don't want to arrest anyone + look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp - if(src.lasercolor)//Lasertag bots do not tase or arrest anyone, just patrol and shoot and whatnot - mode = SECBOT_IDLE - return + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if (src.frustration >= 8) - // for(var/mob/O in hearers(src, null)) - // O << "[src] beeps, \"Backup requested! Suspect has evaded arrest.\"" - src.target = null - src.last_found = world.time - src.frustration = 0 - src.mode = 0 + if (frustration >= 8) walk_to(src,0) + back_to_idle() - if (target) // make sure target exists - if (get_dist(src, src.target) <= 1) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "[lasercolor]ed209-c" + if(target) // make sure target exists + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "[lasercolor]ed209-c" spawn(2) - src.icon_state = "[lasercolor]ed209[src.on]" - var/mob/living/carbon/M = src.target - var/maxstuns = 4 - if (istype(M, /mob/living/carbon/human)) - if (M.stuttering < 5 && (!(HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) + icon_state = "[lasercolor]ed209[on]" + var/mob/living/carbon/M = target + if(istype(M, /mob/living/carbon/human)) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 M.Stun(5) M.Weaken(5) @@ -315,374 +266,128 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - maxstuns-- - if(maxstuns <= 0) - target = null - - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if ((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if ((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 + else + back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target - if(src.lasercolor) - mode = SECBOT_IDLE - return - if (!target) - mode = SECBOT_IDLE - src.anchored = 0 - return - // see if he got away - if ((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) - src.anchored = 0 - mode = SECBOT_HUNT + if(BOT_PREP_ARREST) // preparing to arrest target + + // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) + back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if (!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) - mode = SECBOT_ARREST - target.visible_message("[src] is trying to put handcuffs on [src.target]!",\ - "[src] is trying to put handcuffs on [src.target]!") + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + 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]!") - spawn(60) - if (get_dist(src, src.target) <= 1) - if (src.target.handcuffed) + spawn(60) + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - - if(istype(src.target,/mob/living/carbon)) - src.target.handcuffed = new /obj/item/weapon/restraints/handcuffs(src.target) - target.update_inv_handcuffed(0) //update handcuff overlays - - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) - else - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - if(SECBOT_ARREST) // arresting - if(src.lasercolor) - mode = SECBOT_IDLE - return - if (!target || src.target.handcuffed) - src.anchored = 0 - mode = SECBOT_IDLE - return - - - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 + if(!target.handcuffed) + target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) + target.update_inv_handcuffed(0) //update the handcuffs overlay + back_to_idle() + else + back_to_idle() return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() - - return - - -// perform a single patrol step - -/obj/machinery/bot/ed209/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - if(lasercolor) - sleep(20) - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - + else + back_to_idle() return - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/ed209/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/ed209/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/ed209/proc/at_patrol_target() - find_patrol_target() - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/ed209/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/ed209/receive_signal(datum/signal/signal) - - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 + if(BOT_ARREST) + if (!target) + anchored = 0 + mode = BOT_IDLE + last_found = world.time + frustration = 0 return - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 + if(target.handcuffed) //no target or target cuffed? back to idle. + back_to_idle() return - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" - dat += "Tiles left: [src.amount]
" - dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) - dat += "Improves floors: [src.improvefloors ? "Yes" : "No"]
" - dat += "Finds tiles: [src.eattiles ? "Yes" : "No"]
" - dat += "Make singles pieces of metal into tiles when empty: [src.maketiles ? "Yes" : "No"]
" + dat += "Floor Repairer Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" + dat += "Tiles left: [amount]
" + dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) + dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
" + dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
" + dat += "Finds tiles: [eattiles ? "Yes" : "No"]
" + dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" + dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" + dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode - if (src.targetdirection) - bmode = dir2text(src.targetdirection) + if (targetdirection) + bmode = dir2text(targetdirection) else - bmode = "Disabled" - dat += "
Bridge Mode : [bmode]
" + bmode = "disabled" + dat += "Bridge Mode : [bmode]
" - user << browse("
" - dat += "Status: [src.on ? "On" : "Off"]
" - dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" + dat += "Medical Unit Controls v1.1
" + dat += "Status: [on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [open ? "opened" : "closed"]
" dat += "Beaker: " - if (src.reagent_glass) - dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" + if (reagent_glass) + dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]" else dat += "None Loaded" - dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked || issilicon(user)) + dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
" + if(!locked || issilicon(user)) dat += "Healing Threshold: " dat += "-- " dat += "- " - dat += "[src.heal_threshold] " + dat += "[heal_threshold] " dat += "+ " dat += "++" dat += "
" dat += "Injection Level: " dat += "- " - dat += "[src.injection_amount] " + dat += "[injection_amount] " dat += "+ " dat += "
" dat += "Reagent Source: " - dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" + dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" + dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
" + dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
" + dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
" + dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" + dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
" - user << browse("
Multiple Utility Load Effector Mk. IV
" + dat += "Multiple Utility Load Effector Mk. V
" dat += "ID: [suffix]" dat += "Power: [on ? "On" : "Off"]
" if(!open) dat += "
Status
" + dat += ""
switch(mode)
- if(0)
- dat += "Ready"
- if(1)
- dat += "Loading/Unloading"
- if(2)
- dat += "Navigating to Delivery Location"
- if(3)
- dat += "Navigating to Home"
- if(4)
- dat += "Waiting for clear path"
- if(5,6)
- dat += "Calculating navigation path"
- if(7)
- dat += "Unable to reach destination"
+ if(BOT_IDLE)
+ dat += "Ready"
+ if(BOT_LOADING)
+ dat += "[mode_name[BOT_LOADING]]"
+ if(BOT_DELIVER)
+ dat += "[mode_name[BOT_DELIVER]]"
+ if(BOT_GO_HOME)
+ dat += "[mode_name[BOT_GO_HOME]]"
+ if(BOT_BLOCKED)
+ dat += "[mode_name[BOT_BLOCKED]]"
+ if(BOT_NAV,BOT_WAIT_FOR_NAV)
+ dat += "[mode_name[BOT_NAV]]"
+ if(BOT_NO_ROUTE)
+ dat += "[mode_name[BOT_NO_ROUTE]]"
dat += "
"
dat += "Current Load: [load ? load.name : "none"]" @@ -225,6 +215,7 @@ var/global/mulebot_count = 0 dat += "Set Home
" dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" + dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -245,9 +236,9 @@ var/global/mulebot_count = 0 //user << browse("
Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]
-Maintenance panel panel is [src.open ? "opened" : "closed"]
"}, +Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"}, -"[src.on ? "On" : "Off"]" ) +"[on ? "On" : "Off"]" ) - if(!src.locked || issilicon(user)) + if(!locked || issilicon(user)) dat += text({"
Arrest Unidentifiable Persons: []
Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
-
Operating Mode: []
Report Arrests[]
Auto Patrol: []"}, -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]", +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - var/datum/browser/popup = new(user, "autosec", "Securitron v1.5.1 controls") + var/datum/browser/popup = new(user, "autosec", "Automatic Security Unit v1.6") popup.set_content(dat) popup.open() return /obj/machinery/bot/secbot/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - if((href_list["power"]) && (src.allowed(usr))) - if (src.on && !src.emagged) - turn_off() - else - turn_on() - return + + ..() switch(href_list["operation"]) if("idcheck") - src.idcheck = !src.idcheck - src.updateUsrDialog() + idcheck = !idcheck + updateUsrDialog() if("weaponscheck") - src.weaponscheck = !src.weaponscheck - src.updateUsrDialog() + weaponscheck = !weaponscheck + updateUsrDialog() if("ignorerec") - src.check_records = !src.check_records - src.updateUsrDialog() + check_records = !check_records + updateUsrDialog() if("switchmode") - src.arrest_type = !src.arrest_type - src.updateUsrDialog() - if("patrol") - auto_patrol = !auto_patrol - mode = SECBOT_IDLE + arrest_type = !arrest_type updateUsrDialog() if("declarearrests") - src.declare_arrests = !src.declare_arrests - src.updateUsrDialog() - if("hack") - if(!src.emagged) - src.emagged = 2 - src.hacked = 1 - usr << "You overload [src]'s target identification system." - else if(!src.hacked) - usr << "[src] refuses to accept your authority!" - else - src.emagged = 0 - src.hacked = 0 - usr << "You reboot [src] and restore the target identification." - src.updateUsrDialog() + declare_arrests = !declare_arrests + updateUsrDialog() + /obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if(src.allowed(user) && !open && !emagged) - src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + if(allowed(user) && !open && !emagged) + locked = !locked + user << "Controls are now [locked ? "locked." : "unlocked."]" else if(emagged) user << "ERROR" if(open) user << "Please close the access panel before locking it." else - user << "Access denied." + user << " Access denied." else ..() if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry. return - if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. threatlevel = user.assess_threat(src) threatlevel += 6 if(threatlevel >= 4) - src.target = user - src.mode = SECBOT_HUNT + target = user + mode = BOT_HUNT /obj/machinery/bot/secbot/Emag(mob/user as mob) ..() - if(open && !locked) - if(user) user << "You short out [src]'s target assessment circuits." - spawn(0) - audible_message("[src] buzzes oddly!") - src.target = null - if(user) src.oldtarget_name = user.name - src.last_found = world.time - src.anchored = 0 - src.declare_arrests = 0 - src.emagged = 2 - src.on = 1 - src.icon_state = "secbot[src.on]" - mode = SECBOT_IDLE -/obj/machinery/bot/secbot/process() - set background = BACKGROUND_ENABLED + if(emagged == 2) + if(user) + user << " You short out [src]'s target assessment circuits." + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "secbot[on]" - if(!src.on) +/obj/machinery/bot/secbot/bot_process() + if (!..()) return switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol - mode = SECBOT_START_PATROL // switch to patrol mode + mode = BOT_START_PATROL // switch to patrol mode - if(SECBOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) - // for(var/mob/O in hearers(src, null)) - // O << "[src] beeps, \"Backup requested! Suspect has evaded arrest.\"" - src.target = null - src.last_found = world.time - src.frustration = 0 - src.mode = SECBOT_IDLE + if(frustration >= 8) walk_to(src,0) + back_to_idle() + return if(target) // make sure target exists - if(src.Adjacent(target) && isturf(src.target.loc)) // if right next to perp - playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - src.icon_state = "secbot-c" + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + icon_state = "secbot-c" spawn(2) - src.icon_state = "secbot[src.on]" - var/mob/living/carbon/M = src.target - var/maxstuns = 4 + icon_state = "secbot[on]" + var/mob/living/carbon/M = target if(istype(M, /mob/living/carbon/human)) - if(M.stuttering < 5 && (!(HULK in M.mutations))) + if( M.stuttering < 5 && !(HULK in M.mutations) ) M.stuttering = 5 M.Stun(5) M.Weaken(5) @@ -277,396 +229,143 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) - broadcast_hud_message("[src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] scumbag [target] in [location]", src) - target.visible_message("[src.target] has been stunned by [src]!",\ - "[src.target] has been stunned by [src]!") + speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency) + target.visible_message("[target] has been stunned by [src]!",\ + "[target] has been stunned by [src]!") - maxstuns-- - if(maxstuns <= 0) - target = null - - mode = SECBOT_PREP_ARREST - src.anchored = 1 - src.target_lastloc = M.loc + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = M.loc return else // not next to perp - var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) - if((get_dist(src, src.target)) >= (olddist)) - src.frustration++ + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ else - src.frustration = 0 + frustration = 0 + else + back_to_idle() - if(SECBOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target - // see if he got away - if((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) - src.anchored = 0 - mode = SECBOT_HUNT + // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) + back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - mode = SECBOT_ARREST - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipeties on [src.target]!") - - spawn(60) - if(get_dist(src, src.target) <= 1) - if(src.target.handcuffed) + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + 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]!") + spawn(60) + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - - if(istype(src.target,/mob/living/carbon)) + if(!target.handcuffed) target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay - - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) - else - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 - - if(SECBOT_ARREST) // arresting - - if(!target || target.handcuffed) - src.anchored = 0 - mode = SECBOT_IDLE - return - - - if(SECBOT_START_PATROL) // start a patrol - - if(path.len > 0 && patrol_target) // have a valid path, so just resume - mode = SECBOT_PATROL - return - - else if(patrol_target) // has patrol target already - spawn(0) - calc_path() // so just find a route to it - if(path.len == 0) - patrol_target = 0 + playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + back_to_idle() + else + back_to_idle() return - mode = SECBOT_PATROL - - - else // no patrol target, so need a new one - find_patrol_target() - speak("Engaging patrol mode.") - - - if(SECBOT_PATROL) // patrol mode - - patrol_step() - spawn(5) - if(mode == SECBOT_PATROL) - patrol_step() - - if(SECBOT_SUMMON) // summoned to PDA - patrol_step() - spawn(4) - if(mode == SECBOT_SUMMON) - patrol_step() - sleep(4) - patrol_step() - - return - - -// perform a single patrol step -/obj/machinery/bot/secbot/proc/patrol_step() - - if(loc == patrol_target) // reached target - at_patrol_target() - return - - else if(path.len > 0 && patrol_target) // valid path - - var/turf/next = path[1] - if(next == loc) - path -= next - return - - - if(istype( next, /turf/simulated)) - - var/moved = step_towards(src, next) // attempt to move - if(moved) // successful move - blockcount = 0 - path -= loc - - look_for_perp() - else // failed to move - - blockcount++ - - if(blockcount > 5) // attempt 5 times before recomputing - // find new path excluding blocked turf - - spawn(2) - calc_path(next) - if(path.len == 0) - find_patrol_target() - else - blockcount = 0 - - return - - return - - else // not a valid turf - mode = SECBOT_IDLE - return - - else // no path, so calculate new one - mode = SECBOT_START_PATROL - - -// finds a new patrol target -/obj/machinery/bot/secbot/proc/find_patrol_target() - send_status() - if(awaiting_beacon) // awaiting beacon response - awaiting_beacon++ - if(awaiting_beacon > 5) // wait 5 secs for beacon response - find_nearest_beacon() // then go to nearest instead - return - - if(next_destination) - set_destination(next_destination) - else - find_nearest_beacon() - return - - -// finds the nearest beacon to self -// signals all beacons matching the patrol code -/obj/machinery/bot/secbot/proc/find_nearest_beacon() - nearest_beacon = null - new_destination = "__nearest__" - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - spawn(10) - awaiting_beacon = 0 - if(nearest_beacon) - set_destination(nearest_beacon) - else - auto_patrol = 0 - mode = SECBOT_IDLE - speak("Disengaging patrol mode.") - send_status() - - -/obj/machinery/bot/secbot/proc/at_patrol_target() - find_patrol_target() - return - - -// sets the current destination -// signals all beacons matching the patrol code -// beacons will return a signal giving their locations -/obj/machinery/bot/secbot/proc/set_destination(var/new_dest) - new_destination = new_dest - post_signal(beacon_freq, "findbeacon", "patrol") - awaiting_beacon = 1 - - -// receive a radio signal -// used for beacon reception - -/obj/machinery/bot/secbot/receive_signal(datum/signal/signal) - //log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/bot/secbot/receive_signal([signal.debug_print()])") - if(!on) - return - - /* - world << "rec signal: [signal.source]" - for(var/x in signal.data) - world << "* [x] = [signal.data[x]]" - */ - - var/recv = signal.data["command"] - // process all-bot input - if(recv=="bot_status") - send_status() - - // check to see if we are the commanded bot - if(signal.data["active"] == src) - // process control input - switch(recv) - if("stop") - mode = SECBOT_IDLE - auto_patrol = 0 - return - - if("go") - mode = SECBOT_IDLE - auto_patrol = 1 - return - - if("summon") - patrol_target = signal.data["target"] - next_destination = destination - destination = null - awaiting_beacon = 0 - mode = SECBOT_SUMMON - calc_path() - speak("Responding.") - - return - - - - // receive response from beacon - recv = signal.data["beacon"] - var/valid = signal.data["patrol"] - if(!recv || !valid) - return - - if(recv == new_destination) // if the recvd beacon location matches the set destination - // the we will navigate there - destination = new_destination - patrol_target = signal.source.loc - next_destination = signal.data["next_patrol"] - awaiting_beacon = 0 - - // if looking for nearest beacon - else if(new_destination == "__nearest__") - var/dist = get_dist(src,signal.source.loc) - if(nearest_beacon) - - // note we ignore the beacon we are located at - if(dist>1 && dist
Name | Vitals | Position |
| [ID.name] | " + if(I) + var/style = null + var/ijob = jobs[I.assignment] + if(ijob % 10 == 0) + style += "font-weight: bold; " //head roles always end in 0 + if(ijob >= 10 && ijob < 20) + style += "color: #E74C3C; " //security + if(ijob >= 20 && ijob < 30) + style += "color: #3498DB; " //medical + if(ijob >= 30 && ijob < 40) + style += "color: #9B59B6; " //science + if(ijob >= 40 && ijob < 50) + style += "color: #F1C40F; " //engineering + if(ijob >= 50 && ijob < 60) + style += "color: #F39C12; " //cargo + log += "[ijob]]||
| [I.registered_name] ([I.assignment]) | " //ijob does not get displayed, nor does it take up space, it's just used for the positioning of an entry else - log += "||
| Unknown | " + log += "80||
| Unknown | " var/damage_report if(U.sensor_mode > 1) @@ -62,13 +106,13 @@ proc/crewmonitor(mob/user,var/atom/source) var/dam2 = round(H.getToxLoss(),1) var/dam3 = round(H.getFireLoss(),1) var/dam4 = round(H.getBruteLoss(),1) - damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" + damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" switch(U.sensor_mode) if(1) - log += "[life_status] | Not Available | [life_status] | Not Available | " if(2) - log += "[life_status] [damage_report] | Not Available | " + log += "[life_status] [damage_report] | Not Available | " if(3) var/area/player_area = get_area(H) log += "[life_status] [damage_report] | [format_text(player_area.name)] ([pos.x], [pos.y]) | " diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index ab3182f0219..bface7aae31 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -268,6 +268,7 @@ src.temp = text("Are you sure you wish to delete all records?[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] | "} dat += "
" + dat += "
| X | Channel | Nick | Message |
|---|---|---|---|
| [msg.channel] | [msg.sender] | [msg.message] |
ALERT - Cyborg detonation detected: [R.name]
" R.self_destruct() else usr << "Access Denied." @@ -104,10 +106,12 @@ if(can_control(usr, R)) var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") - log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") + message_admins("[key_name(usr, usr.client)](JMP) [R.canmove ? "locked down" : "released"] [key_name(R, R.client)](JMP)!") + log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + if(R.connected_ai) + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ad296e20065..3372945212b 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -122,7 +122,7 @@ for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) var/crimstat = "" for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"])) + if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"])) crimstat = E.fields["criminal"] var/background switch(crimstat) @@ -413,8 +413,10 @@ What a mess.*/ temp += "No" if ("Purge All Records") + investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records") for(var/datum/data/record/R in data_core.security) del(R) + data_core.security.Cut() temp = "All Security records deleted." if ("Add Entry") @@ -460,6 +462,7 @@ What a mess.*/ screen = 3 if ("New Record (General)") + //General Record var/datum/data/record/G = new /datum/data/record() G.fields["name"] = "New Record" G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]" @@ -472,6 +475,7 @@ What a mess.*/ data_core.general += G active1 = G + //Security Record var/datum/data/record/R = new /datum/data/record() R.fields["name"] = active1.fields["name"] R.fields["id"] = active1.fields["id"] @@ -483,7 +487,7 @@ What a mess.*/ data_core.security += R active2 = R - //Medical Record + //Medical Record var/datum/data/record/M = new /datum/data/record() M.fields["id"] = active1.fields["id"] M.fields["name"] = active1.fields["name"] @@ -506,13 +510,17 @@ What a mess.*/ if ("Edit Field") var/a1 = active1 var/a2 = active2 + switch(href_list["field"]) if("name") - if (istype(active1, /datum/data/record)) + if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record)) var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1) return - active1.fields["name"] = t1 + if(istype(active1, /datum/data/record)) + active1.fields["name"] = t1 + if(istype(active2, /datum/data/record)) + active2.fields["name"] = t1 if("id") if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record)) var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN) @@ -607,6 +615,7 @@ What a mess.*/ if ("Change Criminal Status") if (active2) + var/old_field = active2.fields["criminal"] switch(href_list["criminal2"]) if("none") active2.fields["criminal"] = "None" @@ -618,19 +627,27 @@ What a mess.*/ active2.fields["criminal"] = "Parolled" if("released") active2.fields["criminal"] = "Discharged" + investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records") if ("Delete Record (Security) Execute") + investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records") if (active2) + data_core.security -= active2 del(active2) if ("Delete Record (ALL) Execute") if (active1) + investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records") for(var/datum/data/record/R in data_core.medical) if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"])) + data_core.medical -= R del(R) - else + break + data_core.general -= active1 del(active1) + if (active2) + data_core.security -= active2 del(active2) else temp = "This function does not appear to be working at the moment. Our apologies." diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 414bd7a56f2..2f8881e4c4c 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -38,8 +38,9 @@ log_game("[user.ckey]([user]) has authorized early shuttle launch in ([x],[y],[z])") minor_announce("[src.auth_need - src.authorized.len] more authorization(s) needed until shuttle is launched early",null,1) else - message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP)",0,1) - log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z])") + var/time = emergency_shuttle.timeleft() + message_admins("[key_name(user.client)](?) has launched the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) + log_game("[user.ckey]([user]) has launched the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") minor_announce("The emergency shuttle will launch in 10 seconds",null,1) emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) @@ -62,8 +63,9 @@ if(!emagged && emergency_shuttle.location == DOCKED && user.get_active_hand() == W) switch(choice) if("Launch") - message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP)",0,1) - log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z])") + var/time = emergency_shuttle.timeleft() + message_admins("[key_name(user.client)](?) has emagged the emergency shuttle in ([x],[y],[z] - JMP) [time] seconds before launch.",0,1) + log_game("[user.ckey]([user]) has emagged the emergency shuttle in ([x],[y],[z]) [time] seconds before launch.") minor_announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:",null,1) emergency_shuttle.settimeleft( 10 ) emagged = 1 diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index e5acc1ea5af..4ea9ea6993d 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,6 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 + interact_offline = 1 layer = 4 var/on = 0 @@ -45,7 +46,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() - if(!node) + if(!node || !is_operational()) return if(!on) updateDialog() @@ -97,11 +98,17 @@ user << "Seems empty." /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) - if(state_open == 1) + if(..()) + return + + //powerless interaction + if(!is_operational()) + user.unset_machine()//essential to prevent infinite loops of opening/closing the machine + if(state_open) close_machine() else open_machine() + else ui_interact(user) @@ -258,7 +265,7 @@ if(state_open) icon_state = "cell-open" return - if(on) + if(on && is_operational()) if(occupant) icon_state = "cell-occupied" else @@ -266,6 +273,9 @@ else icon_state = "cell-off" +/obj/machinery/atmospherics/unary/cryo_cell/power_change() + ..() + update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() if(air_contents.total_moles() < 10) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 4434006a2ef..a5ca16a2368 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -114,8 +114,8 @@ for reference: qdel(src) return -/obj/structure/barricade/wooden/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. - if(air_group || (height==0)) +/obj/structure/barricade/wooden/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff. + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 @@ -235,8 +235,8 @@ for reference: src.explode() return -/obj/machinery/deployable/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff. - if(air_group || (height==0)) +/obj/machinery/deployable/barrier/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff. + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSTABLE)) return 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a770e7a9c2e..62c86d3a5ad 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -22,7 +22,6 @@ name = "airlock" icon = 'icons/obj/doors/Doorint.dmi' icon_state = "door_closed" - power_channel = ENVIRON var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. var/hackProof = 0 // if 1, this door can't be hacked by the AI @@ -246,7 +245,7 @@ name = "bananium airlock" desc = "Honkhonkhonk" icon = 'icons/obj/doors/Doorbananium.dmi' - var/mineral = "clown" + var/mineral = "bananium" doortype = /obj/structure/door_assembly/door_assembly_clown /obj/machinery/door/airlock/sandstone @@ -1031,7 +1030,7 @@ About the new airlock wires panel: if(locate(/mob/living) in get_turf(src)) // playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) //THE BUZZING IT NEVER STOPS -Pete spawn (60) - close() + autoclose() return crush() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 8b03d1696c5..91890d4b665 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -7,6 +7,7 @@ opacity = 1 density = 1 layer = 2.7 + power_channel = ENVIRON var/secondsElectrified = 0 var/visible = 1 @@ -74,8 +75,7 @@ ..() move_update_air(T) -/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 +/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return !opacity return !density @@ -134,6 +134,7 @@ sleep(6) open() emagged = 1 + desc = "Its access panel is smoking slightly." if(istype(src, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/A = src A.lights = 0 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4e0f21b5317..4f3c30e26bf 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -8,7 +8,6 @@ icon_state = "door_open" opacity = 0 density = 0 - power_channel = ENVIRON var/blocked = 0 var/nextstate = null @@ -111,11 +110,10 @@ flags = ON_BORDER -/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border - if(air_group) return 0 return !density else return 1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index a5f6d14aea6..fa3d6098f00 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -71,11 +71,10 @@ flick(text("[]deny", src.base_state), src) return -/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) //Make sure looking at appropriate border - if(air_group) return 0 return !density else return 1 @@ -238,6 +237,7 @@ src.operating = -1 flick("[src.base_state]spark", src) sleep(6) + desc += "
Its access panel is smoking slightly." if(istype(I, /obj/item/weapon/melee/energy/blade)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 910feb64a41..7e3d588f5f5 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -38,7 +38,7 @@ var/list/doppler_arrays = list() if(!usr || !isturf(usr.loc)) return - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || !usr.canmove) return src.dir = turn(src.dir, 90) return diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 72e0126433d..c75dd415940 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -5,7 +5,7 @@ desc = "A wall-mounted flashbulb device." icon = 'icons/obj/stationobjs.dmi' icon_state = "mflash1" - var/obj/item/device/flash/bulb = null + var/obj/item/device/flash/handheld/bulb = null var/id = null var/range = 2 //this is roughly the size of brig cell var/last_flash = 0 //Don't want it getting spammed like regular flashes @@ -23,7 +23,7 @@ density = 1 /obj/machinery/flasher/New() - bulb = new /obj/item/device/flash(src) + bulb = new /obj/item/device/flash/handheld(src) /obj/machinery/flasher/power_change() if (powered() && anchored && bulb) @@ -40,13 +40,15 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user) 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.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") - bulb.loc = src.loc - bulb = null - power_change() + if(do_after(user, 30)) + 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)) + 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.drop_item() @@ -174,4 +176,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 44be02fadac..3e1b2cc3ca2 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -84,6 +84,8 @@ Class Procs: process() 'game/machinery/machine.dm' Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + is_operational() + Returns 0 if the machine is unpowered, broken or undergoing maintenance, 1 if not Compiled by Aygar */ @@ -209,6 +211,11 @@ Class Procs: add_fingerprint(usr) return 0 +/obj/machinery/proc/is_operational() + return !(stat & (NOPOWER|BROKEN|MAINT)) + +//////////////////////////////////////////////////////////////////////////////////////////// + /mob/proc/canUseTopic() //TODO: once finished, place these procs on the respective mob files return @@ -302,7 +309,7 @@ Class Procs: var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 7eb17034f64..37d65fe849d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -2,6 +2,11 @@ //################### NEWSCASTERS BE HERE! #### //###-Agouri################################### +/datum/feed_comment + var/author = "" + var/body = "" + var/time_stamp = "" + /datum/feed_message var/author ="" var/body ="" @@ -11,6 +16,9 @@ var/is_admin_message = 0 var/icon/img = null var/time_stamp = "" + var/list/datum/feed_comment/comments = list() + var/locked = 0 + var/caption = "" /datum/feed_channel var/channel_name="" @@ -29,6 +37,7 @@ src.backup_body = "" src.backup_author = "" src.img = null + src.locked = 0 /datum/feed_channel/proc/clear() src.channel_name = "" @@ -54,14 +63,16 @@ newChannel.is_admin_channel = adminChannel network_channels += newChannel -/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0) +/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1) var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = author newMsg.body = msg newMsg.time_stamp = "[worldtime2text()]" newMsg.is_admin_message = adminMessage + newMsg.locked = !allow_comments if(photo) newMsg.img = photo.img + newMsg.caption = photo.scribble for(var/datum/feed_channel/FC in network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel @@ -151,6 +162,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/c_locked=0; //Will our new channel be locked to public submissions? var/hitstaken = 0 //Death at 3 hits from an item with force>=15 var/datum/feed_channel/viewing_channel = null + var/allow_comments = 1 luminosity = 0 anchored = 1 @@ -293,6 +305,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -550,7 +576,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -728,6 +754,34 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index ab94b08d5e7..6f4a0e8cb25 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -21,6 +21,7 @@ Buildable meters #define PIPE_VOLUME_PUMP 16 #define PIPE_HEAT_EXCHANGE 17 #define PIPE_DVALVE 18 +#define PIPE_4WAYMANIFOLD 19 /obj/item/pipe name = "pipe" @@ -34,6 +35,7 @@ Buildable meters item_state = "buildpipe" w_class = 3 level = 2 + var/flipped = 0 /obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null) ..() @@ -77,6 +79,14 @@ Buildable meters src.pipe_type = PIPE_VOLUME_PUMP else if(istype(make_from, /obj/machinery/atmospherics/unary/heat_exchanger)) src.pipe_type = PIPE_HEAT_EXCHANGE + else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w)) + src.pipe_type = PIPE_4WAYMANIFOLD + + var/obj/machinery/atmospherics/trinary/triP = make_from + if(istype(triP) && triP.flipped) + src.flipped = 1 + src.dir = turn(src.dir, -45) + else src.pipe_type = pipe_type src.dir = dir @@ -108,6 +118,7 @@ Buildable meters "volume pump", \ "heat exchanger", \ "digital valve", \ + "4-way manifold", \ ) name = nlist[pipe_type+1] + " fitting" var/list/islist = list( \ @@ -130,6 +141,7 @@ Buildable meters "volumepump", \ "heunary", \ "dvalve", \ + "manifold4w", \ ) icon_state = islist[pipe_type + 1] @@ -143,17 +155,32 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 - //src.pipe_dir = get_pipe_dir() + fixdir() + + return + +/obj/item/pipe/verb/flip() + set category = "Object" + set name = "Flip Pipe" + set src in view(1) + + if ( usr.stat || usr.restrained() || !usr.canmove ) + return + + if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) + src.dir = turn(src.dir, flipped ? 45 : -45) + flipped = !flipped + return + + src.dir = turn(src.dir, -180) + + fixdir() + return /obj/item/pipe/Move() @@ -161,6 +188,8 @@ Buildable meters if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \ && (src.dir in cardinal)) src.dir = src.dir|turn(src.dir, 90) + else if ((pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) && flipped) + src.dir = turn(src.dir, 45+90) else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) if(dir==2) dir = 1 @@ -173,9 +202,14 @@ Buildable meters /obj/item/pipe/proc/get_pipe_dir() if (!dir) return 0 - var/flip = turn(dir, 180) - var/cw = turn(dir, -90) - var/acw = turn(dir, 90) + + var/direct = dir + if(flipped) + direct = turn(dir, 45) + + var/flip = turn(direct, 180) + var/cw = turn(direct, -90) + var/acw = turn(direct, 90) switch(pipe_type) if( PIPE_SIMPLE_STRAIGHT, \ @@ -188,15 +222,17 @@ Buildable meters PIPE_MVALVE, \ PIPE_DVALVE \ ) - return dir|flip + return direct|flip if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT) - return dir //dir|acw + return direct //dir|acw if(PIPE_CONNECTOR,PIPE_UVENT,PIPE_SCRUBBER,PIPE_HEAT_EXCHANGE) - return dir + return direct if(PIPE_MANIFOLD) return flip|cw|acw + if(PIPE_4WAYMANIFOLD) + return NORTH|SOUTH|EAST|WEST if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) - return dir|flip|cw + return direct|flip|cw return 0 /obj/item/pipe/proc/get_pdir() //endpoints for regular pipes @@ -231,6 +267,20 @@ Buildable meters else return 0 +/obj/item/pipe/proc/unflip(var/direction) + if(!(direction in cardinal)) + return turn(direction, 45) + + return direction + +//Helper to clean up dir +/obj/item/pipe/proc/fixdir() + if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) + if(dir==2) + dir = 1 + else if(dir==8) + dir = 4 + /obj/item/pipe/attack_self(mob/user as mob) return rotate() @@ -241,11 +291,9 @@ Buildable meters return ..() if (!isturf(src.loc)) return 1 - if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE)) - if(dir==2) - dir = 1 - else if(dir==8) - dir = 4 + + fixdir() + var/pipe_dir = get_pipe_dir() for(var/obj/machinery/atmospherics/M in src.loc) @@ -319,6 +367,26 @@ Buildable meters M.node3.addMember(M) M.build_network() + if(PIPE_4WAYMANIFOLD) //manifold + var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc ) + + var/turf/T = M.loc + M.level = T.intact ? 2 : 1 + M.initialize() + if (M.node1) + M.node1.initialize() + M.node1.addMember(M) + if (M.node2) + M.node2.initialize() + M.node2.addMember(M) + if (M.node3) + M.node3.initialize() + M.node3.addMember(M) + if (M.node4) + M.node4.initialize() + M.node4.addMember(M) + M.build_network() + if(PIPE_JUNCTION) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc ) P.dir = src.dir @@ -403,29 +471,16 @@ Buildable meters P.node2.initialize() P.node2.build_network() - if(PIPE_GAS_FILTER) //gas filter - var/obj/machinery/atmospherics/trinary/filter/P = new(src.loc) - P.dir = dir - P.initialize_directions = pipe_dir - if (pipename) - P.name = pipename - var/turf/T = P.loc - P.level = T.intact ? 2 : 1 - P.initialize() - P.build_network() - if (P.node1) - P.node1.initialize() - P.node1.build_network() - if (P.node2) - P.node2.initialize() - P.node2.build_network() - if (P.node3) - P.node3.initialize() - P.node3.build_network() + if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) //Trinary stuff - if(PIPE_GAS_MIXER) //gas filter - var/obj/machinery/atmospherics/trinary/mixer/P = new(src.loc) - P.dir = dir + var/obj/machinery/atmospherics/trinary/P + if(pipe_type == PIPE_GAS_FILTER) + P = new /obj/machinery/atmospherics/trinary/filter(src.loc) + else if(pipe_type == PIPE_GAS_MIXER) + P = new /obj/machinery/atmospherics/trinary/mixer(src.loc) + + P.flipped = flipped + P.dir = unflip(dir) P.initialize_directions = pipe_dir if (pipename) P.name = pipename @@ -573,4 +628,5 @@ Buildable meters #undef PIPE_PASSIVE_GATE #undef PIPE_VOLUME_PUMP #undef PIPE_OUTLET_INJECT -#undef PIPE_DVALVE \ No newline at end of file +#undef PIPE_DVALVE +#undef PIPE_4WAYMANIFOLD \ No newline at end of file diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ee7ad2dd4d3..ddc44cc8610 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -17,6 +17,7 @@ Pipe
Bent Pipe
Manifold
+4-Way Manifold
Manual Valve
Digital Valve
Devices:
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 52e3037b635..0d8bc250c32 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -364,9 +364,9 @@ emagged = 1 on=0 - sleep(rand(60,600)) - if(!on) - on=1 + spawn(rand(60,600)) + if(!on) + on=1 ..() @@ -459,31 +459,18 @@ targets += C //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee - if(targets.len > 0) //if there are targets to shoot - - var/atom/t = pick(targets) //pick a perp from the list of targets. Targets go first because they are the most important - - if(istype(t, /mob/living)) //if a mob - var/mob/living/M = t //simple typecasting - if(M.stat != DEAD) //if the target is not dead - spawn() - popUp() //pop the turret up if it's not already up. - dir = get_dir(src, M) //even if you can't shoot, follow the target - spawn() - shootAt(M) //shoot the target, finally - - else - if(secondarytargets.len > 0) //if there are no primary targets, go for secondary targets - var/mob/t = pick(secondarytargets) - if(istype(t, /mob/living)) - if(t.stat != DEAD) - spawn() - popUp() - dir=get_dir(src, t) - shootAt(t) - else + if(!tryToShootAt(targets)) + if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets spawn() - popDown() + popDown() // no valid targets, close the cover + + +/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) + while(targets.len > 0) + var/mob/living/M = pick(targets) + targets -= M + if(target(M)) + return 1 /obj/machinery/porta_turret/proc/popUp() //pops the turret up @@ -573,15 +560,19 @@ return threatcount -/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) //shoots at a target +/obj/machinery/porta_turret/proc/target(var/mob/living/target) if(disabled) return + if(target && (target.stat != DEAD) && (!(target.lying) || emagged)) + spawn() + popUp() //pop the turret up if it's not already up. + dir = get_dir(src, target) //even if you can't shoot, follow the target + spawn() + shootAt(target) + return 1 + return - if(lasercolor && istype(target,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - if(H.lying) - return - +/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 2220eb7c732..a5006803963 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -26,8 +26,8 @@ ..() move_update_air(T) -/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height, air_group) - if(!height || air_group) return 0 +/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height) + if(!height) return 0 else return ..() /obj/machinery/shield/CanAtmosPass(var/turf/T) @@ -594,8 +594,8 @@ return -/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0)) return 1 +/obj/machinery/shieldwall/CanPass(atom/movable/mover, turf/target, height=0) + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSGLASS)) return prob(20) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5e98e3eafcf..2cacd1b075e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -427,8 +427,8 @@ /obj/machinery/suit_storage_unit/container_resist() var/mob/living/user = usr if(islocked) - user.changeNext_move(100) - user.last_special = world.time + 100 + 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.)" visible_message("You see [user] kicking against the doors of the [src]!") diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index c22f5980c5f..668f94b2327 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -110,8 +110,9 @@ wires.Interact(user) if(!open_panel) if(!active) - settings(user) - return + spawn() + settings(user) + return else if(anchored) user << "The bomb is bolted to the floor!" return @@ -205,10 +206,10 @@ /obj/item/weapon/bombcore/training/proc/reset() var/obj/machinery/syndicatebomb/holder = src.loc if(istype(holder)) - holder.open_panel = 0 if(holder.wires) holder.wires.Shuffle() holder.defused = 0 + holder.open_panel = 0 holder.update_icon() holder.updateDialog() @@ -226,8 +227,10 @@ if(istype(holder)) attempts++ defusals++ - holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires...") - reset() + holder.loc.visible_message("\icon[holder] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...") + sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out + if(istype(holder)) + reset() /obj/item/weapon/bombcore/badmin name = "badmin payload" diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 5f00666e819..a4c672dc38a 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -42,7 +42,7 @@ AM.loc = src.loc do_transform(AM) -/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) +/obj/machinery/transformer/CanPass(atom/movable/mover, turf/target, height=0) if(!ishuman(mover)) // Allows items to go through, to stop them from blocking the conveyour belt. var/dir = get_dir(src, mover) if(dir == EAST) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2670407895f..3427f8a655d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -648,9 +648,16 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/weapon/storage/fancy/cigarettes = 5, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/weapon/storage/box/matches = 10, + /obj/item/weapon/lighter/random = 4, + /obj/item/weapon/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/weapon/lighter/zippo = 4) - premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1) refill_canister = /obj/item/weapon/vending_refill/cigarette @@ -715,7 +722,7 @@ icon_state = "sec" icon_deny = "sec-deny" req_access_txt = "1" - 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 = 5, + 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/normal = 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) @@ -757,7 +764,7 @@ vend_delay = 15 vend_reply = "Have an enchanted evening!" product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/staff = 2) + products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/head/wizard/yellow = 1,/obj/item/clothing/suit/wizrobe/yellow = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/staff = 2) contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave /obj/machinery/vending/autodrobe @@ -773,8 +780,7 @@ /obj/item/clothing/head/helmet/gladiator = 1,/obj/item/clothing/under/gimmick/rank/captain/suit = 1,/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/labcoat/mad = 1,/obj/item/clothing/glasses/gglasses = 1,/obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/blackskirt = 1,/obj/item/clothing/head/beret = 1, - /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1, - /obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1, + /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1, /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1, @@ -858,7 +864,7 @@ icon_state = "robotics" icon_deny = "robotics-deny" req_access_txt = "29" - products = list(/obj/item/clothing/suit/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4, + products = list(/obj/item/clothing/suit/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash/handheld = 4, /obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3, /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index fcd17eea035..1a45add5d88 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -28,6 +28,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if( state != 4 ) usr << "The washing machine cannot run in this state." return diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 7ebf0183f41..b1e60d07b28 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,21 +4,9 @@ var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) internal_damage_threshold = 50 - maint_access = 0 - //add_req_access = 0 - //operation_req_access = list(access_hos) damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" -/* -/obj/mecha/combat/range_action(target as obj|mob|turf) - if(internal_damage&MECHA_INT_CONTROL_LOST) - target = pick(view(3,target)) - if(selected_weapon) - selected_weapon.fire(target) - return -*/ - /obj/mecha/combat/melee_action(target as obj|mob|turf) if(internal_damage&MECHA_INT_CONTROL_LOST) target = safepick(oview(1,src)) @@ -26,21 +14,10 @@ if(istype(target, /mob/living)) var/mob/living/M = target if(src.occupant.a_intent == "harm") - playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if(damtype == "brute") step_away(M,src,15) - /* - if(M.stat>1) - M.gib() - melee_can_hit = 0 - if(do_after(melee_cooldown)) - melee_can_hit = 1 - return - */ if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/H = target - // if (M.health <= 0) return - var/obj/item/organ/limb/temp = H.get_organ(pick("chest", "chest", "chest", "head")) if(temp) var/update = 0 @@ -48,14 +25,17 @@ if("brute") H.Paralyse(1) update |= temp.take_damage(rand(force/2, force), 0) + playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if("fire") update |= temp.take_damage(0, rand(force/2, force)) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if("tox") + playsound(src, 'sound/effects/spray2.ogg', 50, 1) if(H.reagents) - if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) - H.reagents.add_reagent("carpotoxin", force) if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - H.reagents.add_reagent("cryptobiolin", force) + H.reagents.add_reagent("cryptobiolin", force/2) + if(H.reagents.get_reagent_amount("toxin") + force < force*2) + H.reagents.add_reagent("toxin", force/2.5) else return if(update) H.update_damage_overlays(0) @@ -66,14 +46,17 @@ if("brute") M.Paralyse(1) M.take_overall_damage(rand(force/2, force)) + playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if("fire") M.take_overall_damage(0, rand(force/2, force)) + playsound(src, 'sound/items/Welder.ogg', 50, 1) if("tox") + playsound(src, 'sound/effects/spray2.ogg', 50, 1) if(M.reagents) - if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2) - M.reagents.add_reagent("carpotoxin", force) if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - M.reagents.add_reagent("cryptobiolin", force) + M.reagents.add_reagent("cryptobiolin", force/2) + if(M.reagents.get_reagent_amount("toxin") + force < force*2) + M.reagents.add_reagent("toxin", force/2.5) else return M.updatehealth() @@ -109,134 +92,6 @@ break return -/* -/obj/mecha/combat/proc/mega_shake(target) - if(!istype(target, /obj) && !istype(target, /mob)) return - if(istype(target, /mob)) - var/mob/M = target - M.Dizzy(3) - M.adjustBruteLoss(1) - M.updatehealth() - for (var/mob/V in viewers(src)) - V.show_message("[src.name] shakes [M] like a rag doll.") - return -*/ - -/* - if(energy>0 && can_move) - if(step(src,direction)) - can_move = 0 - spawn(step_in) can_move = 1 - if(overload) - energy = energy-2 - health-- - else - energy-- - return 1 - - return 0 -*/ -/* -/obj/mecha/combat/hear_talk(mob/M as mob, text) - ..() - if(am && M==occupant) - if(findtext(text,"")) - sam() - return - -/obj/mecha/combat/proc/sam() - if(am) - var/window = {" - - - - - -
-
-
-
-
- "}
- occupant << browse(window, "window=sam;size=800x600;")
- onclose(occupant, "sam", src)
- return
-*/
/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob)
if(..())
if(H.client)
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index 66a5036a9a7..3a49c11433a 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -38,7 +38,7 @@
set name = "Toggle defence mode"
set src = usr.loc
set popup_menu = 0
- if(usr!=src.occupant)
+ if(!can_use(usr))
return
defence = !defence
if(defence)
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 79ae3333d63..722b576f134 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -56,7 +56,7 @@
set name = "Toggle leg actuators overload"
set src = usr.loc
set popup_menu = 0
- if(usr!=src.occupant)
+ if(!can_use(usr))
return
if(overload)
overload = 0
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index a0010e1a893..52818f4c72a 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -94,50 +94,21 @@
return
/obj/mecha/combat/marauder/relaymove(mob/user,direction)
- if(user != src.occupant) //While not "realistic", this piece is player friendly.
- user.loc = get_turf(src)
- user << "You climb out from [src]"
- return 0
- if(!can_move)
- return 0
if(zoom)
if(world.time - last_message > 20)
src.occupant_message("Unable to move while in zoom mode.")
last_message = world.time
return 0
- if(connected_port)
- if(world.time - last_message > 20)
- src.occupant_message("Unable to move while connected to the air system port")
- last_message = world.time
- return 0
- if(!thrusters && pr_inertial_movement && src.pr_inertial_movement.active())
- return 0
- if(state || !has_charge(step_energy_drain))
- return 0
- var/tmp_step_in = step_in
- var/tmp_step_energy_drain = step_energy_drain
- var/move_result = 0
- if(internal_damage&MECHA_INT_CONTROL_LOST)
- move_result = mechsteprand()
- else if(src.dir!=direction)
- move_result = mechturn(direction)
- else
- move_result = mechstep(direction)
- if(move_result)
- if(istype(src.loc, /turf/space))
- if(!src.check_for_support() && pr_inertial_movement)
- src.pr_inertial_movement.start(list(src,direction))
- if(thrusters)
- src.pr_inertial_movement.set_process_args(list(src,direction))
- tmp_step_energy_drain = step_energy_drain*2
+ return ..()
- can_move = 0
- spawn(tmp_step_in) can_move = 1
- use_power(tmp_step_energy_drain)
+
+/obj/mecha/combat/marauder/Process_Spacemove(var/movement_dir = 0)
+ if(..())
+ return 1
+ if(thrusters && movement_dir && use_power(step_energy_drain))
return 1
return 0
-
/obj/mecha/combat/marauder/verb/toggle_thrusters()
set category = "Exosuit Interface"
set name = "Toggle thrusters"
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 465a1b7a06e..4260976a41a 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -1,9 +1,9 @@
/obj/mecha/combat/phazon
- desc = "An exosuit which can only be described as 'WTF?'."
+ desc = "This is a Phazon exosuit. The pinnacle of scientific research and pride of Nanotrasen, it uses cutting edge bluespace technology and expensive materials."
name = "\improper Phazon"
icon_state = "phazon"
- step_in = 1
- dir_in = 1 //Facing North.
+ step_in = 2
+ dir_in = 2 //Facing South.
step_energy_drain = 3
health = 200
deflect_chance = 30
@@ -12,21 +12,11 @@
infra_luminosity = 3
wreckage = /obj/structure/mecha_wreckage/phazon
add_req_access = 1
- //operation_req_access = list()
internal_damage_threshold = 25
force = 15
var/phasing = 0
var/phasing_energy_drain = 200
- max_equip = 4
-
-
-/obj/mecha/combat/phazon/New()
- ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/rcd
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/gravcatapult
- ME.attach(src)
- return
+ max_equip = 3
/obj/mecha/combat/phazon/Bump(var/atom/obstacle)
if(phasing && get_charge()>=phasing_energy_drain)
@@ -51,20 +41,23 @@
/obj/mecha/combat/phazon/verb/switch_damtype()
set category = "Exosuit Interface"
- set name = "Change melee damage type"
+ set name = "Reconfigure arm microtool arrays"
set src = usr.loc
set popup_menu = 0
if(usr!=src.occupant)
return
- var/new_damtype = alert(src.occupant,"Melee Damage Type",null,"Brute","Fire","Toxic")
+ var/new_damtype = alert(src.occupant,"Arm tool selection",null,"Fists","Torch","Toxic injector")
switch(new_damtype)
- if("Brute")
+ if("Fists")
damtype = "brute"
- if("Fire")
+ src.occupant_message("Your exosuit's hands form into fists.")
+ if("Torch")
damtype = "fire"
- if("Toxic")
+ src.occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
+ if("Toxic injector")
damtype = "tox"
- src.occupant_message("Melee damage type switched to [new_damtype ]")
+ src.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
+ playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)
return
/obj/mecha/combat/phazon/get_commands()
@@ -72,7 +65,7 @@
Special
[station_name()] [src.name]
\ + [fluffnotice]" + switch(get_area_type()) + if(AREA_SPACE) + text += "
According to the [src.name], you are now in outer space. Hold your breath.
\ + " + if(AREA_SPECIAL) + text += "This place is not noted on the [src.name].
" + return text + + +/obj/item/areaeditor/Topic(href, href_list) + if(..()) return - if (!href_list["action"]) - return - switch(href_list["action"]) - if ("create_area") - if (get_area_type()!=AREA_SPACE) - interact() - return + if(href_list["create_area"]) + if(get_area_type()==AREA_SPACE) create_area() - if ("edit_area") - if (get_area_type()!=AREA_STATION) - interact() - return - edit_area() + updateUsrDialog() -/obj/item/blueprints/interact() + +//One-use area creation permits. +/obj/item/areaeditor/permit + name = "construction permit" + icon_state = "permit" + desc = "This is a one-use permit that allows the user to offically declare a built room as new addition to the station." + fluffnotice = "Nanotrasen Engineering requires all on-station construction projects to be approved by a head of staff, as detailed in Nanotrasen Company Regulation 512-C (Mid-Shift Modifications to Company Property). \ + By submitting this form, you accept any fines, fees, or personal injury/death that may occur during construction." + + +/obj/item/areaeditor/permit/attack_self(mob/user as mob) + . = ..() var/area/A = get_area() - var/text = {"[station_name()] blueprints
-Property of Nanotrasen. For heads of staff only. Store in high-secure storage.-"} - switch (get_area_type()) - if (AREA_SPACE) - text += {" -
According to the blueprints, you are now in outer space. Hold your breath.
- -"} - if (AREA_STATION) - text += {" -According to the blueprints, you are now in \"[A.name]\".
-You may -move an amendment to the drawing.
-"} - if (AREA_SPECIAL) - text += {" -This place is not noted on the blueprint.
-"} - else - return - text += "" - usr << browse(text, "window=blueprints") + if(get_area_type() == AREA_STATION) + . += "According to the [src], you are now in \"[A.name]\".
" + var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) + popup.set_content(.) + popup.open() onclose(usr, "blueprints") -/obj/item/blueprints/proc/get_area() +/obj/item/areaeditor/permit/create_area() + ..() + qdel(src) + + +//Station blueprints!!! +/obj/item/areaeditor/blueprints + name = "station blueprints" + desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it." + icon = 'icons/obj/items.dmi' + icon_state = "blueprints" + fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage." + + +/obj/item/areaeditor/blueprints/attack_self(mob/user as mob) + . = ..() + var/area/A = get_area() + if(get_area_type() == AREA_STATION) + . += "According to the [src], you are now in \"[A.name]\".
" + . += "You may move an amendment to the drawing.
" + var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) + popup.set_content(.) + popup.open() + onclose(user, "blueprints") + + +/obj/item/areaeditor/blueprints/Topic(href, href_list) + ..() + if(href_list["edit_area"]) + if(get_area_type()!=AREA_STATION) + return + edit_area() + updateUsrDialog() + + +/obj/item/areaeditor/proc/get_area() var/turf/T = get_turf(usr) var/area/A = T.loc A = A.master return A -/obj/item/blueprints/proc/get_area_type(var/area/A = get_area()) + +/obj/item/areaeditor/proc/get_area_type(var/area/A = get_area()) if (istype(A,/area/space)) return AREA_SPACE var/list/SPECIALS = list( @@ -92,15 +119,14 @@ move an amendment to the drawing. /area/syndicate_station, /area/wizard_station, /area/prison - // /area/derelict //commented out, all hail derelict-rebuilders! ) for (var/type in SPECIALS) if ( istype(A,type) ) return AREA_SPECIAL return AREA_STATION -/obj/item/blueprints/proc/create_area() - //world << "DEBUG: create_area" + +/obj/item/areaeditor/proc/create_area() var/res = detect_room(get_turf(usr)) if(!istype(res,/list)) switch(res) @@ -133,22 +159,16 @@ move an amendment to the drawing. move_turfs_to_area(turfs, A) A.SetDynamicLighting() - spawn(5) - //ma = A.master ? "[A.master]" : "(null)" - //world << "DEBUG: create_area(5):A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" - interact() + interact() return -/obj/item/blueprints/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) +/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) A.contents.Add(turfs) - //oldarea.contents.Remove(usr.loc) // not needed - //T.loc = A //error: cannot change constant value -/obj/item/blueprints/proc/edit_area() +/obj/item/areaeditor/proc/edit_area() var/area/A = get_area() - //world << "DEBUG: edit_area" var/prevname = "[A.name]" var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", prevname, MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel @@ -164,8 +184,7 @@ move an amendment to the drawing. return - -/obj/item/blueprints/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) +/obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) if (!oldtitle) // or replacetext goes to infinite loop return for(var/area/RA in A.related) @@ -181,7 +200,8 @@ move an amendment to the drawing. M.name = replacetext(M.name,oldtitle,title) //TODO: much much more. Unnamed airlocks, cameras, etc. -/obj/item/blueprints/proc/check_tile_is_border(var/turf/T2,var/dir) + +/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir) if (istype(T2, /turf/space)) return BORDER_SPACE //omg hull breach we all going to die here if (istype(T2, /turf/simulated/shuttle)) @@ -208,7 +228,8 @@ move an amendment to the drawing. return BORDER_NONE -/obj/item/blueprints/proc/detect_room(var/turf/first) + +/obj/item/areaeditor/proc/detect_room(var/turf/first) var/list/turf/found = new var/list/turf/pending = list(first) while(pending.len) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 7c3acc111d6..153ce9426ce 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -5,10 +5,11 @@ desc = "A folded bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" + var/unfoldedbag_path = /obj/structure/closet/body_bag w_class = 2 /obj/item/bodybag/attack_self(mob/user) - var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) + var/obj/structure/closet/body_bag/R = new unfoldedbag_path(user.loc) R.add_fingerprint(user) qdel(src) @@ -36,7 +37,9 @@ icon_state = "bodybag_closed" icon_closed = "bodybag_closed" icon_opened = "bodybag_open" + var/foldedbag_path = /obj/item/bodybag density = 0 + mob_storage_capacity = 2 /obj/structure/closet/body_bag/attackby(obj/item/I, mob/user) @@ -69,7 +72,7 @@ /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) ..() - if(over_object == usr && (in_range(src, usr) || usr.contents.Find(src))) + if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src))) if(!ishuman(usr)) return 0 if(opened) @@ -77,13 +80,36 @@ if(contents.len) return 0 visible_message("[usr] folds up [src].") - var/obj/item/bodybag/B = new /obj/item/bodybag(get_turf(src)) + var/obj/item/bodybag/B = new foldedbag_path(get_turf(src)) usr.put_in_hands(B) qdel(src) -/obj/structure/closet/bodybag/update_icon() +/obj/structure/closet/body_bag/update_icon() if(!opened) icon_state = icon_closed else icon_state = icon_opened + + +// Bluespace bodybag + +/obj/item/bodybag/bluespace + name = "bluespace body bag" + desc = "A folded bluespace body bag designed for the storage and transportation of cadavers." + icon = 'icons/obj/bodybag.dmi' + icon_state = "bluebodybag_folded" + unfoldedbag_path = /obj/structure/closet/body_bag/bluespace + w_class = 2 + +/obj/structure/closet/body_bag/bluespace + name = "bluespace body bag" + desc = "A bluespace body bag designed for the storage and transportation of cadavers." + icon = 'icons/obj/bodybag.dmi' + icon_state = "bluebodybag_closed" + icon_closed = "bluebodybag_closed" + icon_opened = "bluebodybag_open" + foldedbag_path = /obj/item/bodybag/bluespace + density = 0 + mob_storage_capacity = 15 + max_mob_size = 2 \ No newline at end of file diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 06a5fb632d6..ac5181f751f 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -44,6 +44,12 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/device/paicard/pai = null // A slot for a personal AI device + var/chat_channel = "#ss13" //name of our current NTRC channel + var/nick = "" //our NTRC nick + var/list/ntrclog = list() //NTRC message log + + var/noreturn = 0 //whether the PDA can use the Return button, used for the aiPDA chatroom + /obj/item/device/pda/medical default_cartridge = /obj/item/weapon/cartridge/medical icon_state = "pda-medical" @@ -186,13 +192,15 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/ai icon_state = "NONE" ttone = "data" + mode = 5 + noreturn = 1 detonate = 0 /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) - return + ..() /obj/item/device/pda/ai/pai ttone = "assist" @@ -257,7 +265,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if ((!isnull(cartridge)) && (mode == 0)) dat += " |
Eject [cartridge]"
- if (mode)
+ if (mode && !noreturn)
dat += " | 
Return"
dat += " | 
Refresh"
@@ -283,7 +291,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "- "
dat += "
Notekeeper "
dat += "
Messenger "
- //dat += "
Nanotrasen Relay Chat "
+ dat += "- Nanotrasen Relay Chat "
if (cartridge)
if (cartridge.access_clown)
@@ -297,12 +305,18 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "
Power Monitor "
+ if(istype(cartridge.radio, /obj/item/radio/integrated/floorbot))
+ dat += "
Floorbot Access "
dat += "
Medical Records "
dat += "
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner "
+ if(istype(cartridge.radio, /obj/item/radio/integrated/medbot))
+ dat += "
Medibot Access "
+ dat += "
Engineering Functions
" dat += "- "
dat += "
Medical Functions
" dat += "- "
dat += "
Security Functions
" @@ -325,6 +339,8 @@ var/global/list/obj/item/device/pda/PDAs = list() if (cartridge) if (cartridge.access_janitor) dat += "
Custodial Locator
Cleanbot Access
Signaler System" if (5) - dat += "
Nanotrasen Relay Chat
"
-
- dat += " Detected Channels
: 
"
- dat += " SS13 Nanotrasen Relay Chat Network
"
+ dat += "[nick] | "
+ dat += "[chat_channel] | "
+ dat += "Write message | "
+ dat += "Help" + if(chat_channel) + dat += ntrclog[chat_channel] else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub. dat += cart @@ -467,9 +485,9 @@ var/global/list/obj/item/device/pda/PDAs = list() mode = 0 else mode = round(mode/10) - if(mode==4)//Fix for cartridges. Redirects to hub. + if(mode==4 || mode == 5)//Fix for cartridges. Redirects to hub. mode = 0 - else if(mode >= 40 && mode <= 49)//Fix for cartridges. Redirects to refresh the menu. + else if(mode >= 40 && mode <= 59)//Fix for cartridges. Redirects to refresh the menu. cartridge.mode = mode cartridge.unlock() if ("Authenticate")//Checks for ID @@ -502,7 +520,7 @@ var/global/list/obj/item/device/pda/PDAs = list() mode = 3 if("4")//Redirects to hub mode = 0 - if("chatroom") // chatroom hub + if("5")//Chatroom mode = 5 @@ -607,6 +625,53 @@ var/global/list/obj/item/device/pda/PDAs = list() return +//CHATROOM FUNCTIONS==================================== + + if("Set Nick") + var/t = stripped_input(U, "Please enter nickname", name, null) as text + nick = copytext(sanitize(t), 1, 9) + + if("Set Channel") + var/t = stripped_input(U, "Please enter channel", name, (chat_channel)) as text + + if(t) + ntrclog[chat_channel] = "
" + ntrclog[chat_channel] + var/datum/chatroom/C = chatchannels[chat_channel] + if(!findtext(t,"#",1,2)) + t = "#" + t + chat_channel = t + C.parse_msg(src, nick, "/join [chat_channel]") + + if("NTRC Message") + var/t = msg_input(U) as text + var/datum/chatroom/C = chatchannels[chat_channel] + if(C) + var/lt = text2list(t, " ") + if(lt[1] == "/join") + if(!findtext(lt[2],"#",1,2)) + lt[2] = "#" + lt[2] + var/ret = C.parse_msg(src,nick,t) + if(findtextEx(ret,"ERR_",1,5)) + ntrclog[chat_channel] = "[ret]
" + ntrclog[chat_channel] + else + if(ret == 0) + ntrclog[chat_channel] = "Failure
" + ntrclog[chat_channel] + else + if(lt[1] == "/join") + chat_channel = lt[2] + + if("NTRC Help") + var/helptext = "NTRC reference:
" + helptext += "General commands
" + helptext += "/join #channel
/part
/log amountoflines
/who
/topic
/register
" + helptext += "Moderation commands
" + helptext += "/ban targetnick
/unban targetnick
/kick targetnick
/mute targetnick
" + helptext += "Management commands
" + helptext += "/topic topictext
/op targetnick
/deop targetnick
/delchannel" + usr << browse(helptext, "window=ntrchelp;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") + + + //SYNDICATE FUNCTIONS=================================== if("Toggle Door") @@ -667,8 +732,9 @@ var/global/list/obj/item/device/pda/PDAs = list() else//Cartridge menu linking mode = text2num(href_list["choice"]) - cartridge.mode = mode - cartridge.unlock() + if(cartridge) + cartridge.mode = mode + cartridge.unlock() else//If not in range, can't interact or not using the pda. U.unset_machine() U << browse(null, "window=pda") @@ -700,40 +766,39 @@ var/global/list/obj/item/device/pda/PDAs = list() id.loc = get_turf(src) id = null -/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) - +/obj/item/device/pda/proc/msg_input(var/mob/living/U = usr) var/t = input(U, "Please enter message", name, null) as text t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN) - if (!t || !istype(P)) + if (!t || toff) return if (!in_range(src, U) && loc != U) return - - if (isnull(P)||P.toff || toff) + if(!can_use(U)) return + if(emped) + t = Gibberish(t, 100) + return t + +/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) + + var/t = msg_input(U) if (last_text && world.time < last_text + 5) return - if(!can_use(U)) + if (isnull(P) || P.toff || !istype(P)) return last_text = world.time - // check if telecomms I/O route 1459 is stable - //var/telecomms_intact = telecomms_process(P.owner, owner, t) var/obj/machinery/message_server/useMS = null if(message_servers) for (var/obj/machinery/message_server/MS in message_servers) //PDAs are now dependant on the Message Server. if(MS.active) useMS = MS - break var/datum/signal/signal = src.telecomms_process() - if(emped) - t = Gibberish(t, 100) - var/useTC = 0 if(signal) if(signal.data["done"]) @@ -755,7 +820,8 @@ var/global/list/obj/item/device/pda/PDAs = list() P.tnote += "← From [owner] ([ownjob]):
[t]
" if (!P.silent) - P.loc.audible_message("\icon[P] *[P.ttone]*", null, 3) + playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) + P.loc.audible_message("\icon[P] *[P.ttone]*", null, 3) //Search for holder of the PDA. var/mob/living/L = null if(P.loc && isliving(P.loc)) @@ -773,7 +839,6 @@ var/global/list/obj/item/device/pda/PDAs = list() else U << "ERROR: Server isn't responding." - /obj/item/device/pda/verb/verb_remove_id() set category = "Object" set name = "Remove id" @@ -1036,6 +1101,18 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You do not have a PDA. You should make an issue report about this." +/mob/living/silicon/ai/verb/cmd_use_chatroom() + set category = "AI Commands" + set name = "PDA - Chatrooms" + if(usr.stat == 2) + usr << "You can't do that because you are dead!" + return + if(!isnull(aiPDA)) + aiPDA.mode = 5 + aiPDA.attack_self(src) + else + usr << "You do not have a PDA. You should make an issue report about this." + /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob) if(user.stat == 2) user << "You can't do that because you are dead!" @@ -1076,6 +1153,17 @@ var/global/list/obj/item/device/pda/PDAs = list() spawn(200 * severity) emped -= 1 +//ntrc handler proc +/obj/item/device/pda/proc/msg_chat(channel as text, sender as text, message as text) + var/msg = "[strip_html_properly(sender)]| [strip_html_properly(message)]
" + if(!channel) + for(var/C in ntrclog) + ntrclog[C] = msg + ntrclog[C] + else + ntrclog[channel] = msg + ntrclog[channel] + if (!silent) + loc.audible_message("\icon[src] *[ttone]*", null, 3) + /proc/get_viewable_pdas() . = list() // Returns a list of PDAs which can be viewed from another PDA/message monitor. diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 082db03166a..e42c3cf453a 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -38,21 +38,37 @@ icon_state = "cart-e" access_engine = 1 + /obj/item/weapon/cartridge/engineering/New() + ..() + radio = new /obj/item/radio/integrated/floorbot(src) + /obj/item/weapon/cartridge/atmos name = "\improper BreatheDeep cartridge" icon_state = "cart-a" access_atmos = 1 + /obj/item/weapon/cartridge/atmos/New() + ..() + radio = new /obj/item/radio/integrated/floorbot(src) + /obj/item/weapon/cartridge/medical name = "\improper Med-U cartridge" icon_state = "cart-m" access_medical = 1 + /obj/item/weapon/cartridge/medical/New() + ..() + radio = new /obj/item/radio/integrated/medbot(src) + /obj/item/weapon/cartridge/chemistry name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" access_reagent_scanner = 1 + /obj/item/weapon/cartridge/chemistry/New() + ..() + radio = new /obj/item/radio/integrated/medbot(src) + /obj/item/weapon/cartridge/security name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" @@ -79,6 +95,10 @@ icon_state = "cart-j" access_janitor = 1 +/obj/item/weapon/cartridge/janitor/New() + ..() + radio = new /obj/item/radio/integrated/cleanbot(src) + /obj/item/weapon/cartridge/lawyer name = "\improper P.R.O.V.E. cartridge" icon_state = "cart-s" @@ -167,6 +187,10 @@ access_engine = 1 access_atmos = 1 +/obj/item/weapon/cartridge/ce/New() + ..() + radio = new /obj/item/radio/integrated/floorbot(src) + /obj/item/weapon/cartridge/cmo name = "\improper Med-U DELUXE cartridge" icon_state = "cart-cmo" @@ -175,6 +199,10 @@ access_reagent_scanner = 1 access_medical = 1 +/obj/item/weapon/cartridge/cmo/New() + ..() + radio = new /obj/item/radio/integrated/medbot(src) + /obj/item/weapon/cartridge/rd name = "\improper Signal Ace DELUXE cartridge" icon_state = "cart-rd" @@ -249,6 +277,67 @@ frequency.post_signal(src, status_signal) +/obj/item/weapon/cartridge/proc/bot_control(var/obj/item/radio/integrated/SC) + + + if(!SC) + menu = "Interlink Error - Please reinsert cartridge." + return + + if(!SC.active) + // list of bots + if(!SC.botlist || (SC.botlist && SC.botlist.len==0)) + menu += "No bots found.
" + + else + for(var/obj/machinery/bot/B in SC.botlist) + menu += "[B] at [get_area(B)]
" + + menu += "
Scan for active bots" + + else // bot selected, control it + + menu += "[SC.active]
Status: (
refresh)" + + if(!SC.botstatus) + menu += "Waiting for response...
" + else + + menu += "Location: [SC.botstatus["loca"] ]
" + menu += "Mode: " + + switch(SC.botstatus["mode"]) + if(BOT_IDLE) + menu += "Ready" + if(BOT_HUNT) + menu += "Apprehending target" + if(BOT_PREP_ARREST,BOT_ARREST) + menu += "Arresting target" + if(BOT_START_PATROL) + menu += "Starting patrol" + if(BOT_PATROL) + menu += "On patrol" + if(BOT_SUMMON) + menu += "Responding to summons" + if(BOT_CLEANING) + menu += "Cleaning" + if(BOT_MOVING) + menu += "Proceeding to work site" + if(BOT_REPAIRING) + menu += "Performing repairs" + if(BOT_HEALING) + menu += "Medicating patient" + if(BOT_RESPONDING) + menu += "Proceeding to AI waypoint" + + menu += "
\[Stop Patrol\] " + menu += "\[Start Patrol\] " + menu += "\[Summon Bot\]
" + menu += "
Return to bot list" + menu += "Keep an ID inserted to upload access codes upon summoning." + return menu + + /obj/item/weapon/cartridge/proc/generate_menu() switch(mode) if(40) //signaller @@ -457,52 +546,8 @@ Code: menu += "
" if (46) //beepsky control var/obj/item/radio/integrated/beepsky/SC = radio - if(!SC) - menu = "Interlink Error - Please reinsert cartridge." - return - menu = "
Securitron Interlink
"
-
- if(!SC.active)
- // list of bots
- if(!SC.botlist || (SC.botlist && SC.botlist.len==0))
- menu += "No bots found." - - else - for(var/obj/machinery/bot/secbot/B in SC.botlist) - menu += "[B] at [B.loc.loc]
" - - menu += "
Scan for active bots" - - else // bot selected, control it - - menu += "[SC.active]
Status: (
refresh)" - - if(!SC.botstatus) - menu += "Waiting for response...
" - else - - menu += "Location: [SC.botstatus["loca"] ]
" - menu += "Mode: " - - switch(SC.botstatus["mode"]) - if(0) - menu += "Ready" - if(1) - menu += "Apprehending target" - if(2,3) - menu += "Arresting target" - if(4) - menu += "Starting patrol" - if(5) - menu += "On patrol" - if(6) - menu += "Responding to summons" - - menu += "
\[Stop Patrol\] " - menu += "\[Start Patrol\] " - menu += "\[Summon Bot\]
" - menu += "
Return to bot list"
+ bot_control(SC)
if (47) //quartermaster order records
menu = "
Supply Record Interlink
"
@@ -526,7 +571,6 @@ Code:
if(!QC)
menu = "Interlink Error - Please reinsert cartridge."
return
-
menu = "
M.U.L.E. bot Interlink V0.8
"
if(!QC.active)
@@ -552,19 +596,19 @@ Code:
menu += "Mode: "
switch(QC.botstatus["mode"])
- if(0)
+ if(BOT_IDLE)
menu += "Ready"
- if(1)
+ if(BOT_LOADING)
menu += "Loading/Unloading"
- if(2)
+ if(BOT_DELIVER)
menu += "Navigating to Delivery Location"
- if(3)
+ if(BOT_GO_HOME)
menu += "Navigating to Home"
- if(4)
+ if(BOT_BLOCKED)
menu += "Waiting for clear path"
- if(5,6)
+ if(BOT_NAV,BOT_WAIT_FOR_NAV)
menu += "Calculating navigation path"
- if(7)
+ if(BOT_NO_ROUTE)
menu += "Unable to locate destination"
var/obj/structure/closet/crate/C = QC.botstatus["load"]
menu += "Current Load: [ !C ? "none" : "[C.name] (unload)" ]
" @@ -641,6 +685,20 @@ Code: menu += "ERROR: Unable to determine current location." menu += "
Refresh GPS Locator" + if (50) //Cleanbot control + menu = "
Cleanbot Interlink
"
+ var/obj/item/radio/integrated/cleanbot/SC = radio
+ bot_control(SC)
+
+ if (51) //floorbot control
+ menu = " Floorbot Interlink
"
+ var/obj/item/radio/integrated/floorbot/SC = radio
+ bot_control(SC)
+
+ if (52) //Medibot control
+ menu = " Medibot Interlink
"
+ var/obj/item/radio/integrated/medbot/SC = radio
+ bot_control(SC)
/obj/item/weapon/cartridge/Topic(href, href_list)
..()
diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm
index 007d3892c20..1ba6a4c5813 100644
--- a/code/game/objects/items/devices/PDA/chatroom.dm
+++ b/code/game/objects/items/devices/PDA/chatroom.dm
@@ -1,16 +1,212 @@
-var/list/chatrooms = list()
+var/datum/chatroom/default_ntrc_chatroom = new("")
+var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom)
+
+//procs that can be used directly:
+//channel.parse_msg
/datum/chatroom
- var/name = "Generic Chatroom"
- var/list/logged_in = list()
+ var/name = "#ss13"
+ var/topic = "Welcome to the best NTRC channel in this sector of the galaxy!" // topic message for the chatroom
+ var/list/operators = list() // chat operators
var/list/logs = list() // chat logs
+ var/list/muted = list() // muted users
var/list/banned = list() // banned users
- var/list/whitelist = list() // whitelisted users
- var/list/muted = list()
- var/topic = "" // topic message for the chatroom
- var/password = "" // blank for no password.
- var/operator = "" // name of the operator
+ var/list/auth = list() // authenticated clients
+ var/list/users = list() // current users
+ var/datum/events/events = new ()
+ var/list/datum/event/evlist = list()
-/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password)
- if(!device)
- return
+//parse_msg() is the exposed interface chat
+//clients should interact with parse_msg() and parse_msg() only
+
+/datum/chatroom/proc/parse_msg(client,nick,message)
+ var/obj/machinery/message_server/MS = check_server(client)
+ if(!MS)
+ return "ERR_TCOM"
+
+ if(!nick || length(nick) > 8)
+ return "ERR_NICK"
+
+ MS.send_chat_message(nick,name,message)
+
+ if(findtext(message,"/",1,2))
+ return handle_command(client,nick,copytext(message,2))
+
+ else
+ return send_message(client,nick,message)
+
+//the following are for internal use only
+
+/datum/chatroom/proc/check_server(client)
+ var/atom/C = client
+ var/turf/CT = get_turf(C)
+ if(message_servers)
+ for (var/obj/machinery/message_server/MS in message_servers)
+ var/turf/T = get_turf(MS)
+ if(MS.active && (T.z == CT.z))
+ return MS
+ return 0
+
+/datum/chatroom/proc/handle_command(client,nick,command) //command parser
+ var/list/cmd=text2list(command, " ")
+
+ if(!get_auth(client,nick))
+ return "ERR_AUTH"
+
+ switch(cmd[1]) //argument-less commmands
+ if("topic")
+ if(cmd.len == 1)
+ return get_topic(client)
+ else
+ return set_topic(client,nick,cmd[2])
+ if("part")
+ return channel_part(client,nick)
+ if("delchannel")
+ return delete_channel(client,nick)
+ if("who")
+ return get_who(client, nick)
+ if("register")
+ return register_auth(client,nick)
+
+ if(cmd.len == 1)
+ return "ERR_ARGS"
+
+ switch(cmd[1]) //commands with 1 arg
+ if("join")
+ return channel_join(client,nick,cmd[2])
+ if("log")
+ return get_log(client,nick,cmd[2])
+ if("op")
+ return make_op(client,nick,cmd[2])
+ if("deop")
+ return deop(client,nick,cmd[2])
+ if("ban")
+ return ban(client,nick,cmd[2])
+ if("unban")
+ return unban(client,nick,cmd[2])
+ if("kick")
+ return kick(client,nick,cmd[2])
+ if("mute")
+ return mute_nick(client,nick,cmd[2])
+
+ return "ERR_WCMD"
+
+/datum/chatroom/proc/send_message(client,nick,message) //standard message
+ if(nick in muted)
+ return "ERR_MUTE"
+ if(!message)
+ return "ERR_BLNK"
+ logs += "[strip_html_properly(nick)]> [strip_html_properly(message)]"
+ log_chat("[usr]/([usr.ckey]) as [nick] sent to [name]: [message]")
+ events.fireEvent("msg_chat",name,nick,message)
+ return 1
+
+/datum/chatroom/proc/get_auth(client,nick) //check auth
+ if((!(nick in auth)) || (auth[nick] == client))
+ return 1
+ return 0
+
+//chat commands go here
+/datum/chatroom/proc/register_auth(client,nick) //register
+ if(!get_auth(client,nick))
+ return 0
+ auth[nick] = client
+ return 1
+
+/datum/chatroom/proc/delete_channel(client,nick) //delchannel
+ if(nick in operators)
+ for(var/event in events.events)
+ events.clearEvent("msg_chat",event)
+ qdel(src)
+ return 1
+ return 0
+
+/datum/chatroom/proc/channel_join(client,nick,channel) //join
+ if(!findtext(channel,"#",1,2))
+ channel = "#" + channel
+ if(channel == name)
+ if((nick in banned) || (nick in users))
+ return 0
+ users += nick
+ get_topic(client,nick)
+ evlist[nick] = events.addEvent("msg_chat",client,"msg_chat")
+ return 1
+ else
+ if(!(channel in chatchannels))
+ var/ret = new_channel(client,nick,channel)
+ if(!ret)
+ return 0
+ channel_part(client,nick)
+ var/datum/chatroom/C = chatchannels[channel]
+ return C.parse_msg(client,nick,"/join [channel]")
+
+/datum/chatroom/proc/channel_part(client,nick) //part
+ users -= nick
+ events.clearEvent("msg_chat",evlist[nick])
+ return 1
+
+/datum/chatroom/proc/make_op(client,nick,target) //op
+ if(nick in operators)
+ operators += target
+ return 1
+ return 0
+
+/datum/chatroom/proc/deop(client,nick,target) //deop
+ if(nick in operators)
+ operators -= target
+ return 1
+ return 0
+
+/datum/chatroom/proc/ban(client,nick,target) //ban
+ if(nick in operators)
+ banned += target
+ return 1
+ return 0
+
+/datum/chatroom/proc/unban(client,nick,target) //unban
+ if(nick in operators)
+ banned -= target
+ return 1
+ return 0
+
+/datum/chatroom/proc/kick(client,nick,target) //kick
+ if(nick in operators)
+ channel_part(null,nick)
+ return 1
+ return 0
+
+/datum/chatroom/proc/set_topic(client,nick,newtopic) //topic
+ if(nick in operators)
+ topic = strip_html_properly(newtopic)
+ return 1
+ return 0
+
+/datum/chatroom/proc/get_topic(client,nick) //topic
+ call(client,"msg_chat")(name,"NTbot","TOPIC: [topic]")
+ return 1
+
+/datum/chatroom/proc/get_who(client,nick) //who
+ for(var/user in users)
+ call(client,"msg_chat")(name,"NTbot","WHO: [user]")
+ return 1
+
+/datum/chatroom/proc/get_log(client,nick,lines) //log
+ for(var/i=0;i" dat += {"[A.control_disabled ? "Enable" : "Disable"] Wireless Activity"} dat += "
" + dat += {"[A.radio_enabled ? "Disable" : "Enable"] Subspace Radio"} + dat += "
" dat += {" Close"} user << browse(dat, "window=aicard") onclose(user, "aicard") @@ -110,4 +112,9 @@ overlays -= image('icons/obj/aicards.dmi', "aicard-on") else overlays += image('icons/obj/aicards.dmi', "aicard-on") + + if ("Radio") + for(var/mob/living/silicon/ai/A in src) + A.radio_enabled = !A.radio_enabled + A << "Your Subspace Transceiver has been [A.radio_enabled ? "enabled" : "disabled"]!" attack_self(U) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 1c41c285f3e..48de883c68c 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -23,15 +23,15 @@ return 1 -/obj/item/device/flash/proc/burn_out(var/mob/user) //Made so you can override it if you want to have an invincible flash from R&D or something. +/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" - user.visible_message("The [src.name] burns out!") + visible_message("The [src.name] burns out!") /obj/item/device/flash/proc/flash_recharge(var/mob/user) if(prob(times_used * 2)) //if you use it 5 times in a minute it has a 10% chance to break! - burn_out(user) + burn_out() return 0 var/deciseconds_passed = world.time - last_used @@ -156,4 +156,6 @@ name = "memorizer" desc = "If you see this, you're not likely to remember it any time soon." icon_state = "memorizer" - item_state = "nullrod" \ No newline at end of file + item_state = "nullrod" + +/obj/item/device/flash/handheld //this is now the regular pocket flashes \ No newline at end of file diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm new file mode 100644 index 00000000000..10407aaea8b --- /dev/null +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -0,0 +1,69 @@ + +/obj/item/device/pipe_painter + name = "pipe painter" + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "labeler1" + item_state = "flight" + var/list/modes = list( + "grey" = rgb(255,255,255), + "red" = rgb(255,0,0), + "blue" = rgb(0,0,255), + "cyan" = rgb(0,256,249), + "green" = rgb(30,255,0), + "yellow" = rgb(255,198,0), + "purple" = rgb(130,43,255) + ) + var/mode = "grey" + + m_amt = 5000 + g_amt = 2000 + +/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity_flag) + //Make sure we only paint adjacent items + if(proximity_flag!= 1) + return + + if(!istype(A,/obj/machinery/atmospherics/pipe/simple) && !istype(A,/obj/machinery/atmospherics/pipe/manifold) && !istype(A,/obj/machinery/atmospherics/pipe/manifold4w)) + return + + var/obj/machinery/atmospherics/pipe/P = A + P.color = modes[mode] + P.pipe_color = modes[mode] + user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") + //P.update_icon() + + if(istype(A,/obj/machinery/atmospherics/pipe/simple)) + var/obj/machinery/atmospherics/pipe/simple/pipe = A + + if(pipe.node1) + pipe.node1.update_icon() + if(pipe.node2) + pipe.node2.update_icon() + else if(istype(A,/obj/machinery/atmospherics/pipe/manifold)) + var/obj/machinery/atmospherics/pipe/manifold/pipe = A + + if(pipe.node1) + pipe.node1.update_icon() + if(pipe.node2) + pipe.node2.update_icon() + if(pipe.node3) + pipe.node3.update_icon() + else if(istype(A,/obj/machinery/atmospherics/pipe/manifold4w)) + var/obj/machinery/atmospherics/pipe/manifold4w/pipe = A + + if(pipe.node1) + pipe.node1.update_icon() + if(pipe.node2) + pipe.node2.update_icon() + if(pipe.node3) + pipe.node3.update_icon() + if(pipe.node4) + pipe.node4.update_icon() + + +/obj/item/device/pipe_painter/attack_self(mob/user as mob) + mode = input("Which colour do you want to use?","Pipe painter") in modes + +/obj/item/device/pipe_painter/examine() + ..() + usr << "It is set to [mode]." diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index fe503966e2a..147eceec49a 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -1,24 +1,27 @@ -/obj/item/device/radio/electropack +/obj/item/device/electropack name = "electropack" desc = "Dance my monkeys! DANCE!!!" + icon = 'icons/obj/radio.dmi' icon_state = "electropack0" item_state = "electropack" - frequency = 1449 flags = CONDUCT slot_flags = SLOT_BACK w_class = 5.0 g_amt = 2500 m_amt = 10000 + var/on = 1 var/code = 2 + var/frequency = 1449 + var/shock_cooldown = 0 -/obj/item/device/radio/electropack/initialize() +/obj/item/device/electropack/initialize() radio_controller.add_object(src, frequency, RADIO_CHAT) -/obj/item/device/radio/electropack/New() +/obj/item/device/electropack/New() if(radio_controller) radio_controller.add_object(src, frequency, RADIO_CHAT) -/obj/item/device/radio/electropack/attack_hand(mob/user) +/obj/item/device/electropack/attack_hand(mob/user) if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.back) @@ -26,12 +29,9 @@ return ..() -/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/clothing/head/helmet)) - if(!b_stat) - user << "[src] is not ready to be attached!" - return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' @@ -52,15 +52,16 @@ if(src.flags & NODROP) A.flags |= NODROP -/obj/item/device/radio/electropack/Topic(href, href_list) +/obj/item/device/electropack/Topic(href, href_list) //..() if(usr.stat || usr.restrained()) return if(((istype(usr, /mob/living/carbon/human) && ((!( ticker ) || (ticker && ticker.mode != "monkey")) && usr.contents.Find(src))) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf))))) usr.set_machine(src) if(href_list["freq"]) - var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"])) - set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = sanitize_frequency(frequency + text2num(href_list["freq"])) + radio_controller.add_object(src, frequency, RADIO_CHAT) else if(href_list["code"]) code += text2num(href_list["code"]) @@ -90,20 +91,19 @@ return return -/obj/item/device/radio/electropack/receive_signal(datum/signal/signal) +/obj/item/device/electropack/receive_signal(datum/signal/signal) if(!signal || signal.encryption != code) return if(ismob(loc) && on) + if(shock_cooldown != 0) + return + shock_cooldown = 1 + spawn(100) + shock_cooldown = 0 var/mob/M = loc - var/turf/T = M.loc - if(istype(T, /turf)) - if(!M.moved_recently && M.last_move) - M.moved_recently = 1 - step(M, M.last_move) - sleep(50) - if(M) - M.moved_recently = 0 + step(M, pick(cardinal)) + M << "You feel a sharp shock!" var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, M) @@ -111,17 +111,17 @@ M.Weaken(5) - if(master && !isWireCut(WIRE_SIGNAL)) + if(master) master.receive_signal() return -/obj/item/device/radio/electropack/attack_self(mob/user as mob, flag1) +/obj/item/device/electropack/attack_self(mob/user) if(!istype(user, /mob/living/carbon/human)) return user.set_machine(src) - var/dat = {" -Turn [on ? "Off" : "On"]
+ var/dat = {"Turned [on ? "On" : "Off"] - +Toggle
Frequency/Code for electropack:
Frequency: - diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 8a92d36b64d..4c41d33541d 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -114,4 +114,7 @@ name = "service radio encryption key" desc = "An encryption key for a radio headset. To access the service channel, use :v." icon_state = "srv_cypherkey" - channels = list("Service" = 1) \ No newline at end of file + channels = list("Service" = 1) + +/obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI. + channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1) \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index c765eff2eb3..0eb78121d83 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -20,16 +20,25 @@ keyslot1 = new /obj/item/device/encryptionkey/ recalculateChannels() +/obj/item/device/radio/headset/Destroy() + qdel(keyslot1) + qdel(keyslot2) + keyslot1 = null + keyslot2 = null + ..() + /obj/item/device/radio/headset/talk_into(mob/living/M as mob, message, channel) if (!listening) return ..() -/obj/item/device/radio/headset/receive_range(freq, level) +/obj/item/device/radio/headset/receive_range(freq, level, var/AIuser) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.ears == src) return ..(freq, level) + else if(AIuser) + return ..(freq, level) return -1 /obj/item/device/radio/headset/syndicate @@ -180,6 +189,13 @@ item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/captain +/obj/item/device/radio/headset/ai + name = "\proper Integrated Subspace Transceiver " + keyslot2 = new /obj/item/device/encryptionkey/ai + +/obj/item/device/radio/headset/ai/receive_range(freq, level) + return ..(freq, level, 1) + /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.set_machine(src) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index e41c84f971f..60b7a1d6c8e 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -50,7 +50,10 @@ initialize() /obj/item/device/radio/Destroy() - remove_radio_all(src) //Just to be sure. + qdel(wires) + wires = null + remove_radio_all(src) //Just to be sure + ..() /obj/item/device/radio/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr @@ -218,7 +221,7 @@ the signal gets processed and logged, and an audible transmission gets sent to each individual headset. */ - + /* be prepared to disregard any comments in all of tcomms code. i tried my best to keep them somewhat up-to-date, but eh */ diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index cd44cf0ae72..b47db22f239 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -164,6 +164,9 @@ MASS SPECTROMETER set name = "Switch Verbosity" set category = "Object" + if(usr.stat || !usr.canmove || usr.restrained()) + return + mode = !mode switch (mode) if(1) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 02867db2e4d..2982e51df18 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -67,11 +67,18 @@ ..() +/obj/item/device/taperecorder/proc/can_use(mob/user) + if(user && ismob(user)) + if(user.stat && user.canmove && !user.restrained()) + return 1 + return 0 + + /obj/item/device/taperecorder/verb/ejectverb() set name = "Eject Tape" set category = "Object" - if(usr.stat) + if(!can_use(usr)) return if(!mytape) return @@ -99,7 +106,7 @@ set name = "Start Recording" set category = "Object" - if(usr.stat) + if(!can_use(usr)) return if(!mytape || mytape.ruined) return @@ -136,7 +143,7 @@ set name = "Stop" set category = "Object" - if(usr.stat) + if(!can_use(usr)) return if(recording) @@ -156,7 +163,7 @@ set name = "Play Tape" set category = "Object" - if(usr.stat) + if(!can_use(usr)) return if(!mytape || mytape.ruined) return @@ -211,7 +218,7 @@ set name = "Print Transcript" set category = "Object" - if(usr.stat) + if(!can_use(usr)) return if(!mytape) return diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 0aef25a67fd..03f27edd891 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -141,6 +141,6 @@ effective or pretty fucking useless. amount += wavelength wavelength = max(1,(min(120,amount))) - updateUsrDialog() + attack_self(usr) add_fingerprint(usr) return \ No newline at end of file diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 3deee5d8cdc..6c2d4fc600c 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -51,8 +51,8 @@ icon_state = "head" construction_time = 350 construction_cost = list("metal"=5000) - var/obj/item/device/flash/flash1 = null - var/obj/item/device/flash/flash2 = null + var/obj/item/device/flash/handheld/flash1 = null + var/obj/item/device/flash/handheld/flash2 = null /obj/item/robot_parts/robot_suit name = "cyborg endoskeleton" @@ -331,8 +331,8 @@ /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/device/flash)) - var/obj/item/device/flash/F = W + 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!" return diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 8d974017521..8f822385dd1 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -95,9 +95,7 @@ hp -= Proj.damage if(hp <= 0) - for(var/mob/O in oviewers()) - if ((O.client && !( O.blinded ))) - O << "[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/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8951c278576..15c4ab31162 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -92,6 +92,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \ new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \ + new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \ new/datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 38c95e33cfd..9ab05593915 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -89,7 +89,7 @@ title+= "[R.title]" title+= " ([R.req_amount] [src.singular_name]\s)" if (can_build) - t1 += text("[] ", src, i, title) + t1 += text("[] ", src, i, title) else t1 += text("[]", title) continue @@ -117,7 +117,8 @@ var/datum/stack_recipe/R = recipes[text2num(href_list["make"])] var/multiplier = text2num(href_list["multiplier"]) - if (!multiplier) multiplier = 1 + if (!multiplier ||(multiplier <= 0)) //href protection + return 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!" @@ -227,7 +228,7 @@ spawn(0) src.interact(usr) else if (S.amount >= max_amount) - return 1 + return var/to_transfer as num if (user.get_inactive_hand()==src) to_transfer = 1 diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 429829cc7fc..2a208746460 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -11,8 +11,8 @@ flags = CONDUCT max_amount = 60 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") - var/on = 1 - var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken + turf_type = /turf/simulated/floor/light + var/state = 0 /obj/item/stack/tile/light/New(var/loc, var/amount=null) ..() diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index 5e922c9a6c5..bad34a66578 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -11,6 +11,7 @@ throw_range = 7 flags = CONDUCT max_amount = 60 + turf_type = /turf/simulated/floor /obj/item/stack/tile/plasteel/cyborg desc = "The ground you walk on" //Not the usual floor tile desc as that refers to throwing, Cyborgs can't do that - RR @@ -47,29 +48,3 @@ return else ..() - -/* -/obj/item/stack/tile/plasteel/attack_self(mob/user as mob) - if (usr.stat) - return - var/T = user.loc - if (!( istype(T, /turf) )) - user << "\red You must be on the ground!" - return - if (!( istype(T, /turf/space) )) - user << "\red You cannot build on or repair this turf!" - return - src.build(T) - src.add_fingerprint(user) - use(1) - return -*/ - -/obj/item/stack/tile/plasteel/proc/build(turf/S as turf) - S.ChangeTurf(/turf/simulated/floor/plating) -// var/turf/simulated/floor/W = S.ReplaceWithFloor() -// W.make_plating() - return - - - diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 05177a54409..3a94618d548 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -10,6 +10,7 @@ throw_range = 7 max_amount = 60 origin_tech = "plasma=1" + turf_type = /turf/simulated/floor/mineral/plasma /obj/item/stack/tile/mineral/uranium name = "uranium tile" @@ -23,6 +24,7 @@ throw_range = 7 max_amount = 60 origin_tech = "material=1" + turf_type = /turf/simulated/floor/mineral/uranium /obj/item/stack/tile/mineral/gold name = "gold tile" @@ -36,6 +38,7 @@ throw_range = 7 max_amount = 60 origin_tech = "material=1" + turf_type = /turf/simulated/floor/mineral/gold /obj/item/stack/tile/mineral/silver name = "silver tile" @@ -49,6 +52,7 @@ throw_range = 7 max_amount = 60 origin_tech = "material=1" + turf_type = /turf/simulated/floor/mineral/silver /obj/item/stack/tile/mineral/diamond name = "diamond tile" @@ -62,6 +66,7 @@ throw_range = 7 max_amount = 60 origin_tech = "material=2" + turf_type = /turf/simulated/floor/mineral/diamond /obj/item/stack/tile/mineral/bananium name = "bananium tile" @@ -75,4 +80,5 @@ throw_range = 7 max_amount = 60 origin_tech = "material=1" + turf_type = /turf/simulated/floor/mineral/bananium diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index c44038b6638..f6015ce854d 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1,17 +1,27 @@ -/* Diffrent misc types of tiles +/* Diffrent misc types of tiles & the tile prototype * Contains: + Tile * Grass * Wood * Carpet */ +/* + * Tile + */ +/obj/item/stack/tile + name = "broken tile" + singular_name = "broken tile" + desc = "A broken tile. This should not exist." + var/turf_type = null + /* * Grass */ /obj/item/stack/tile/grass name = "grass tile" singular_name = "grass floor tile" - desc = "A patch of grass like they often use on golf courses" + desc = "A patch of grass like they often use on golf courses." icon_state = "tile_grass" w_class = 3.0 force = 1.0 @@ -20,6 +30,7 @@ throw_range = 7 max_amount = 60 origin_tech = "biotech=1" + turf_type = /turf/simulated/floor/grass /* * Wood @@ -27,7 +38,7 @@ /obj/item/stack/tile/wood name = "wood floor tile" singular_name = "wood floor tile" - desc = "an easy to fit wood floor tile" + desc = "an easy to fit wood floor tile." icon_state = "tile-wood" w_class = 3.0 force = 1.0 @@ -36,13 +47,15 @@ throw_range = 7 max_amount = 60 origin_tech = "biotech=1" + turf_type = /turf/simulated/floor/wood + /* * Carpets */ /obj/item/stack/tile/carpet name = "carpet" singular_name = "carpet" - desc = "A piece of carpet. It is the same size as a floor tile" + desc = "A piece of carpet. It is the same size as a floor tile." icon_state = "tile-carpet" w_class = 3.0 force = 1.0 @@ -50,3 +63,21 @@ throw_speed = 3 throw_range = 7 max_amount = 60 + turf_type = /turf/simulated/floor/carpet + +/* + * High-traction + */ +/obj/item/stack/tile/noslip + name = "high-traction floor tile" + singular_name = "high-traction floor tile" + desc = "A high-traction floor tile. It feels rubbery in your hand." + icon_state = "tile_noslip" + w_class = 3.0 + force = 1.0 + throwforce = 1.0 + throw_speed = 3 + throw_range = 7 + max_amount = 60 + turf_type = /turf/simulated/floor/noslip + origin_tech = "material=3" \ No newline at end of file diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 387e1eb7519..9b91799d00e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1,16 +1,18 @@ /* Toys! * ContainsL * Balloons - * Fake telebeacon * Fake singularity * Toy gun * Toy crossbow * Toy swords * Crayons * Snap pops - * Water flower + * Mech prizes + * AI core prizes * Cards * Toy nuke + * Fake meteor + * Carp plushie */ @@ -550,79 +552,90 @@ icon = 'icons/obj/toy.dmi' icon_state = "ripleytoy" var/cooldown = 0 + var/quiet = 0 //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user as mob) if(!cooldown) user << "You play with [src]." - playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) cooldown = 1 spawn(30) cooldown = 0 + if (!quiet) + playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) + return + ..() /obj/item/toy/prize/attack_hand(mob/user as mob) if(loc == user) if(!cooldown) user << "You play with [src]." - playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) cooldown = 1 spawn(30) cooldown = 0 + if (!quiet) + playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) return ..() /obj/item/toy/prize/ripley name = "toy Ripley" - desc = "Mini-Mecha action figure! Collect them all! 1/11." + desc = "Mini-Mecha action figure! Collect them all! 1/12." /obj/item/toy/prize/fireripley name = "toy firefighting Ripley" - desc = "Mini-Mecha action figure! Collect them all! 2/11." + desc = "Mini-Mecha action figure! Collect them all! 2/12." icon_state = "fireripleytoy" /obj/item/toy/prize/deathripley name = "toy deathsquad Ripley" - desc = "Mini-Mecha action figure! Collect them all! 3/11." + desc = "Mini-Mecha action figure! Collect them all! 3/12." icon_state = "deathripleytoy" /obj/item/toy/prize/gygax name = "toy Gygax" - desc = "Mini-Mecha action figure! Collect them all! 4/11." + desc = "Mini-Mecha action figure! Collect them all! 4/12." icon_state = "gygaxtoy" /obj/item/toy/prize/durand name = "toy Durand" - desc = "Mini-Mecha action figure! Collect them all! 5/11." + desc = "Mini-Mecha action figure! Collect them all! 5/12." icon_state = "durandprize" /obj/item/toy/prize/honk name = "toy H.O.N.K." - desc = "Mini-Mecha action figure! Collect them all! 6/11." + desc = "Mini-Mecha action figure! Collect them all! 6/12." icon_state = "honkprize" /obj/item/toy/prize/marauder name = "toy Marauder" - desc = "Mini-Mecha action figure! Collect them all! 7/11." + desc = "Mini-Mecha action figure! Collect them all! 7/12." icon_state = "marauderprize" /obj/item/toy/prize/seraph name = "toy Seraph" - desc = "Mini-Mecha action figure! Collect them all! 8/11." + desc = "Mini-Mecha action figure! Collect them all! 8/12." icon_state = "seraphprize" /obj/item/toy/prize/mauler name = "toy Mauler" - desc = "Mini-Mecha action figure! Collect them all! 9/11." + desc = "Mini-Mecha action figure! Collect them all! 9/12." icon_state = "maulerprize" /obj/item/toy/prize/odysseus name = "toy Odysseus" - desc = "Mini-Mecha action figure! Collect them all! 10/11." + desc = "Mini-Mecha action figure! Collect them all! 10/12." icon_state = "odysseusprize" /obj/item/toy/prize/phazon name = "toy Phazon" - desc = "Mini-Mecha action figure! Collect them all! 11/11." + desc = "Mini-Mecha action figure! Collect them all! 11/12." icon_state = "phazonprize" +/obj/item/toy/prize/reticence + name = "toy Reticence" + desc = "Mini-Mecha action figure! Collect them all! 12/12." + icon_state = "reticenceprize" + quiet = 1 + /* * AI core prizes */ @@ -631,6 +644,7 @@ desc = "A little toy model AI core with real law announcing action!" icon = 'icons/obj/toy.dmi' icon_state = "AI" + w_class = 2.0 var/cooldown = 0 /obj/item/toy/AI/attack_self(mob/user) @@ -1004,6 +1018,9 @@ obj/item/toy/cards/deck/syndicate card_throw_range = 7 card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") +/* + * Fake nuke + */ /obj/item/toy/nuke name = "\improper Nuclear Fission Explosive toy" @@ -1027,3 +1044,33 @@ obj/item/toy/cards/deck/syndicate else var/timeleft = (cooldown - world.time) user << "Nothing happens, and '[round(timeleft/10)]' appears on a small display." + +/* + * Fake meteor + */ + +/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™" + icon = 'icons/obj/toy.dmi' + icon_state = "minimeteor" + w_class = 2.0 + +/obj/item/toy/minimeteor/throw_impact(atom/hit_atom) + ..() + playsound(src, 'sound/effects/meteorimpact.ogg', 40, 1) + for(var/mob/M in range(10, src)) + if(!M.stat && !istype(M, /mob/living/silicon/ai))\ + shake_camera(M, 3, 1) + qdel(src) + +/* + * Carp plushie + */ + +/obj/item/toy/carpplushie + name = "space carp plushie" + desc = "An adorable stuffed toy that resembles a space carp." + icon = 'icons/obj/toy.dmi' + icon_state = "carpplushie" + w_class = 2.0 \ No newline at end of file diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 83e8c61a90b..ce4387a2100 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -33,8 +33,11 @@ set category = "Object" set src in usr + if(usr.stat || !usr.canmove || usr.restrained()) + return + if (t) - src.name = text("data disk- '[]'", t) + src.name = "data disk- '[t]'" else src.name = "data disk" src.add_fingerprint(usr) @@ -74,8 +77,8 @@ var/dorm = 0 // determines if this ID has claimed a dorm already /obj/item/weapon/card/id/attack_self(mob/user as mob) - for(var/mob/O in viewers(user, null)) - O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1) + user.visible_message("[user] shows you: \icon[src] [src.name].", \ + "You show \the [src.name].") src.add_fingerprint(user) return @@ -100,25 +103,10 @@ update_label("John Doe", "Clowny") */ /obj/item/weapon/card/id/proc/update_label(var/newname, var/newjob) if(newname || newjob) - name = text("[][]", - (!newname) ? "identification card" : "[newname]'s ID Card", - (!newjob) ? "" : " ([newjob])" - ) + name = "[(!newname) ? "identification card" : "[newname]'s ID Card"][(!newjob) ? "" : " ([newjob])"]" return - name = text("[][]", - (!registered_name) ? "identification card" : "[registered_name]'s ID Card", - (!assignment) ? "" : " ([assignment])" - ) - -/obj/item/weapon/card/id/verb/read() - set name = "Read ID Card" - set category = "Object" - set src in usr - - usr << text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment) - return - + name = "[(!registered_name) ? "identification card" : "[registered_name]'s ID Card"][(!assignment) ? "" : " ([assignment])"]" /obj/item/weapon/card/id/silver desc = "A silver card which shows honour and dedication." diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index ffc7b60fe2f..10be20f0888 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -18,18 +18,21 @@ throwforce = 0 throw_speed = 3 throw_range = 7 + var/cleanspeed = 50 //slower than mop /obj/item/weapon/soap/nanotrasen desc = "A Nanotrasen brand bar of soap. Smells of plasma." icon_state = "soapnt" /obj/item/weapon/soap/deluxe - desc = "A deluxe Waffle Co. brand bar of soap. Smells of condoms." + desc = "A deluxe Waffle Co. brand bar of soap. Smells of high-class luxury." icon_state = "soapdeluxe" + cleanspeed = 40 //same speed as mop because deluxe -- captain gets one of these /obj/item/weapon/soap/syndie - desc = "An untrustworthy bar of soap. Smells of fear." + desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster." icon_state = "soapsyndie" + cleanspeed = 10 //much faster than mop so it is useful for traitors who want to clean crime scenes /obj/item/weapon/soap/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) @@ -43,18 +46,22 @@ if(user.client && (target in user.client.screen)) user << "You need to take that [target.name] off before cleaning it." else if(istype(target,/obj/effect/decal/cleanable)) - user << "You scrub \the [target.name] out." - qdel(target) + user.visible_message("[user] begins to scrub \the [target.name] out with [src].") + if(do_after(user, src.cleanspeed)) + user << "You scrub \the [target.name] out." + qdel(target) else - user << "You clean \the [target.name]." - var/obj/effect/decal/cleanable/C = locate() in target - qdel(C) - target.clean_blood() + user.visible_message("[user] begins to clean \the [target.name] with [src].") + if(do_after(user, src.cleanspeed)) + user << "You clean \the [target.name]." + var/obj/effect/decal/cleanable/C = locate() in target + qdel(C) + target.clean_blood() return /obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob) if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" ) - user.visible_message("\the [user] washes \the [target]'s mouth out with soap!") + user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here return ..() diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm new file mode 100644 index 00000000000..35f6a6a3749 --- /dev/null +++ b/code/game/objects/items/weapons/defib.dm @@ -0,0 +1,343 @@ +//backpack item + +/obj/item/weapon/defibrillator + name = "defibrillator" + desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients." + icon = 'icons/obj/weapons.dmi' + icon_state = "defibunit" + item_state = "defibunit" + slot_flags = SLOT_BACK + force = 5 + throwforce = 6 + w_class = 4 + origin_tech = "biotech=4" + action_button_name = "Toggle Paddles" + + var/on = 0 //if the paddles are equipped (1) or on the defib (0) + var/safety = 1 //if you can zap people with the defibs on harm mode + var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise + var/obj/item/weapon/twohanded/shockpaddles/paddles + var/obj/item/weapon/stock_parts/cell/high/bcell = null + +/obj/item/weapon/defibrillator/New() //starts without a cell for rnd + ..() + paddles = make_paddles() + update_icon() + return + +/obj/item/weapon/defibrillator/loaded/New() //starts with hicap + ..() + paddles = make_paddles() + bcell = new(src) + update_icon() + return + +/obj/item/weapon/defibrillator/update_icon() + update_power() + update_overlays() + update_charge() + +/obj/item/weapon/defibrillator/proc/update_power() + if(bcell) + if(bcell.charge < paddles.revivecost) + powered = 0 + else + powered = 1 + else + powered = 0 + +/obj/item/weapon/defibrillator/proc/update_overlays() + overlays.Cut() + if(!on) + overlays += "defibunit-paddles" + if(powered) + overlays += "defibunit-powered" + if(!bcell) + overlays += "defibunit-nocell" + if(!safety) + overlays += "defibunit-emagged" + +/obj/item/weapon/defibrillator/proc/update_charge() + if(powered) //so it doesn't show charge if it's unpowered + if(bcell) + var/ratio = bcell.charge / bcell.maxcharge + ratio = Ceiling(ratio*4) * 25 + overlays += "defibunit-charge[ratio]" + +/obj/item/weapon/defibrillator/CheckParts() + bcell = locate(/obj/item/weapon/stock_parts/cell) in contents + update_icon() + +/obj/item/weapon/defibrillator/ui_action_click() + if(usr.get_item_by_slot(slot_back) == src) + toggle_paddles() + else + usr << "Put the defibrillator on your back first!" + return + +/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user) + if(istype(W, /obj/item/weapon/stock_parts/cell)) + var/obj/item/weapon/stock_parts/cell/C = W + if(bcell) + user << "[src] already has a cell." + else + if(C.maxcharge < paddles.revivecost) + user << "[src] requires a higher capacity cell." + return + user.drop_item() + W.loc = src + bcell = W + user << "You install a cell in [src]." + + if(istype(W, /obj/item/weapon/card/emag)) + if(safety) + safety = 0 + user << "You silently disable [src]'s safety protocols with the [W]." + else + safety = 1 + user << "You silently enable [src]'s safety protocols with the [W]." + + if(istype(W, /obj/item/weapon/screwdriver)) + if(bcell) + bcell.updateicon() + bcell.loc = get_turf(src.loc) + bcell = null + user << "You remove the cell from the [src]." + + update_icon() + return + +/obj/item/weapon/defibrillator/emp_act(severity) + if(bcell) + deductcharge(1000 / severity) + if(bcell.reliability != 100 && prob(50/severity)) + bcell.reliability -= 10 / severity + if(safety) + safety = 0 + src.visible_message("[src] beeps: Safety protocols disabled!") + playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0) + else + safety = 1 + src.visible_message("[src] beeps: Safety protocols enabled!") + playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0) + update_icon() + ..() + +/obj/item/weapon/defibrillator/verb/toggle_paddles() + set name = "Toggle Paddles" + set category = "Object" + on = !on + + var/mob/living/carbon/human/user = usr + if(on) + //Detach the paddles into the user's hands + var/list/L = list("left hand" = slot_l_hand,"right hand" = slot_r_hand) + if(!user.equip_in_one_of_slots(paddles, L)) + on = 0 + user << "You need a free hand to hold the paddles!" + update_icon() + return + paddles.loc = user + else + //Remove from their hands and back onto the defib unit + remove_paddles(user) + + update_icon() + return + +/obj/item/weapon/defibrillator/proc/make_paddles() + return new /obj/item/weapon/twohanded/shockpaddles(src) + +/obj/item/weapon/defibrillator/equipped(mob/user, slot) + if(slot != slot_back) + remove_paddles(user) + update_icon() + +/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) + var/mob/living/carbon/human/M = user + if(paddles in get_both_hands(M)) + M.unEquip(paddles) + update_icon() + return + +/obj/item/weapon/defibrillator/Destroy() + if(on) + var/M = get(paddles, /mob) + remove_paddles(M) + ..() + update_icon() + return + +/obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt) + if(bcell) + if(bcell.charge < (paddles.revivecost+chrgdeductamt)) + powered = 0 + update_icon() + if(bcell.use(chrgdeductamt)) + update_icon() + return 1 + else + update_icon() + return 0 + +/obj/item/weapon/defibrillator/proc/cooldowncheck(var/mob/user) + spawn(50) + if(bcell) + if(bcell.charge >= paddles.revivecost) + user.visible_message("[src] beeps: Unit ready.") + playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0) + else + user.visible_message("[src] beeps: Charge depleted.") + playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0) + paddles.cooldown = 0 + paddles.update_icon() + update_icon() + +//paddles + +/obj/item/weapon/twohanded/shockpaddles + name = "defibrillator paddles" + desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." + icon = 'icons/obj/weapons.dmi' + icon_state = "defibpaddles" + item_state = "defibpaddles" + force = 0 + throwforce = 6 + w_class = 4 + + var/revivecost = 1000 + var/cooldown = 0 + var/busy = 0 + var/obj/item/weapon/defibrillator/defib + +/obj/item/weapon/twohanded/shockpaddles/New(mainunit) + ..() + if(check_defib_exists(mainunit, src)) + defib = mainunit + loc = defib + busy = 0 + update_icon() + return + +/obj/item/weapon/twohanded/shockpaddles/update_icon() + icon_state = "defibpaddles[wielded]" + item_state = "defibpaddles[wielded]" + if(cooldown) + icon_state = "defibpaddles[wielded]_cooldown" + +/obj/item/weapon/twohanded/shockpaddles/suicide_act(mob/user) + user.visible_message("[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.") + defib.deductcharge(revivecost) + playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1) + return (OXYLOSS) + +/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob) + ..() + user << "The paddles snap back into the main unit." + defib.on = 0 + loc = defib + defib.update_icon() + +/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) + if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns + M.unEquip(O) + qdel(0) + return 0 + else + return 1 + +/obj/item/weapon/twohanded/shockpaddles/attack(mob/M as mob, mob/user as mob) + var/tobehealed + var/threshold = -config.health_threshold_dead + var/mob/living/carbon/human/H = M + + if(busy) + return + if(!defib.powered) + user.visible_message("[defib] beeps: Unit is unpowered.") + playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0) + return + if(!wielded) + user << "You need to wield the paddles in both hands before you can use them on someone!" + return + if(cooldown) + user << "[defib] is recharging." + return + if(!ishuman(M)) + user << "The instructions on [defib] don't mention how to revive that..." + return + else + if(user.a_intent == "harm" && !defib.safety) + busy = 1 + H.visible_message("[M.name] has been touched with [src] by [user]!") + H.adjustStaminaLoss(50) + H.adjustFireLoss(10) + H.Stun(3) + H.updatehealth() //forces health update before next life tick + playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1) + add_logs(user, M, "stunned", object="defibrillator") + defib.deductcharge(revivecost) + cooldown = 1 + busy = 0 + update_icon() + defib.cooldowncheck(user) + return + if(user.zone_sel && user.zone_sel.selecting == "chest") + user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.") + busy = 1 + update_icon() + if(do_after(user, 30)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process + user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.") + playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 0) + var/isghosted = !H.key && H.mind + var/tplus = world.time - H.timeofdeath + var/tlimit = 1500 //past this much time the subject is unrecoverable + var/tloss = 900 //but brain damage starts setting in after some time + if(do_after(user, 20)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total + if(H.stat == 2) + var/health = H.health + var/chance = 90 + for(var/obj/item/carried_item in H.contents) + if(istype(carried_item, /obj/item/clothing/suit/armor)) + chance = 25 + M.visible_message("[M]'s body convulses a bit.") + playsound(get_turf(src), "bodyfall", 50, 1) + playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1) + if(H.health <= -100 && !H.suiciding && prob(chance) && !isghosted && tplus < tlimit && !NOCLONE in H.mutations) + tobehealed = health + threshold + tobehealed -= 5 //They get 5 health in crit to heal the person or inject stabilizers + H.adjustOxyLoss(tobehealed) + user.visible_message("[defib] pings: Resuscitation successful.") + playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0) + H.stat = 1 + dead_mob_list -= H + living_mob_list |= list(H) + H.emote("gasp") + if(tplus > tloss) + H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100)))) + defib.deductcharge(revivecost) + add_logs(user, M, "revived", object="defibrillator") + else + if(tplus > tlimit) + user.visible_message("[defib] buzzes: Resuscitation failed. Tissue damage beyond point of no return for defibrillation.") + else + user.visible_message("[defib] buzzes: Resuscitation failed.") + if(isghosted) + for(var/mob/dead/observer/ghost in player_list) + if(ghost.mind == H.mind) + if(ghost.can_reenter_corpse) + ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)" + ghost << sound('sound/effects/genetics.ogg') + playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 0) + defib.deductcharge(revivecost) + update_icon() + cooldown = 1 + defib.cooldowncheck(user) + else + user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.") + playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0) + busy = 0 + update_icon() + else + user << "You need to target your patient's chest with [src]." + return \ No newline at end of file diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 48bdca424f6..2c7b48d2897 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -58,9 +58,8 @@ add_logs(user, target, "injected", object="[name]") - user.drop_item() inject(target, user) //Now we actually do the heavy lifting. - loc = null //garbage collect + qdel(src) /obj/item/weapon/dnainjector/antihulk diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 6d7cb64a37f..c5ed2ebec31 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -95,6 +95,8 @@ if (istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target W.dismantle_wall(1) + else if(istype(target, /mob/living)) + target.ex_act(2) // c4 can't gib mobs anymore. else target.ex_act(1) if(target) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index b6201fbefba..455c87b9f4c 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -67,27 +67,29 @@ var/direction = get_dir(src,target) - if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored ) + if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored) spawn(0) var/obj/B = usr.buckled var/movementdirection = turn(direction,180) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(1) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(1) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(1) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(2) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(2) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(3) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(3) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) sleep(3) - B.Move(get_step(usr,movementdirection), movementdirection) + step(B, movementdirection) + + else user.newtonian_move(turn(direction, 180)) var/turf/T = get_turf(target) var/turf/T1 = get_step(T,turn(direction, 90)) @@ -118,9 +120,5 @@ if(W.loc == my_target) break sleep(2) - if(!has_gravity(user)) - user.inertia_dir = get_dir(target, user) - step(user, user.inertia_dir) else - return ..() - return + return ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index e7e379530b0..5396cdd8940 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -79,12 +79,14 @@ /* * Wrapping Paper */ -/obj/item/weapon/wrapping_paper +/obj/item/stack/wrapping_paper name = "wrapping paper" desc = "You can use this to wrap items in." icon = 'icons/obj/items.dmi' icon_state = "wrap_paper" + flags = NOBLUDGEON + amount = 25 + max_amount = 25 - -/obj/item/weapon/wrapping_paper/attack_self(mob/user) +/obj/item/stack/wrapping_paper/attack_self(mob/user) user << "You need to use it on a package that has already been wrapped!" diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 2078dfc93bf..642f4a144ff 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -332,6 +332,26 @@ beakers += B2 icon_state = "grenade" + +/obj/item/weapon/grenade/chem_grenade/pacid + name = "acid grenade" + desc = "Used for melting armoured opponents." + stage = READY + +/obj/item/weapon/grenade/chem_grenade/pacid/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + + B1.reagents.add_reagent("pacid", 100) + B1.reagents.add_reagent("potassium", 25) + B2.reagents.add_reagent("phosphorus", 25) + B2.reagents.add_reagent("sugar", 25) + + beakers += B1 + beakers += B2 + icon_state = "grenade" + #undef EMPTY #undef WIRED #undef READY diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index f76f605a17b..cc35b4024a9 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -1,22 +1,8 @@ //improvised explosives// -//iedcasing assembly crafting// -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attackby(var/obj/item/I, mob/user as mob) - if(istype(I, /obj/item/device/assembly/igniter)) - var/obj/item/device/assembly/igniter/G = I - var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing - user.unEquip(G) - user.unEquip(src) - user.put_in_hands(W) - user << "You stuff the [I] in the [src], emptying the contents beforehand." - W.underlays += image(src.icon, icon_state = src.icon_state) - qdel(I) - qdel(src) - - /obj/item/weapon/grenade/iedcasing - name = "improvised firebomb assembly" - desc = "An igniter stuffed into an aluminium shell." + name = "improvised firebomb" + desc = "A weak, improvised incendiary device." w_class = 2.0 icon = 'icons/obj/grenade.dmi' icon_state = "improvised_grenade" @@ -25,52 +11,29 @@ throw_range = 7 flags = CONDUCT slot_flags = SLOT_BELT - var/assembled = 0 - active = 1 + active = 0 det_time = 50 display_timer = 0 var/range = 3 var/times = list() +/obj/item/weapon/grenade/iedcasing/New(loc) + ..() + overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") + overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") + times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + det_time = text2num(pickweight(times)) + if(det_time < 0) //checking for 'duds' + range = 1 + det_time = rand(30,80) + else + range = pick(2,2,2,3,3,3,4) +/obj/item/weapon/grenade/iedcasing/CheckParts() + var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/can = locate() in contents + if(can) + underlays += can -/obj/item/weapon/grenade/iedcasing/afterattack(atom/target, mob/user , flag) //Filling up the can - if(assembled == 0) - if(istype(target, /obj/structure/reagent_dispensers/fueltank) && in_range(src, target)) - if(target.reagents.total_volume < 50) - user << "There's not enough fuel left to work with." - return - var/obj/structure/reagent_dispensers/fueltank/F = target - F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, - assembled = 1 - user << "You've filled the makeshift explosive with welding fuel." - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) - desc = "An improvised firebomb assembly. Filled to the brim with 'Firery flavor'" - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - return - - -/obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition - if(istype(I, /obj/item/stack/cable_coil)) - if(assembled == 1) - var/obj/item/stack/cable_coil/C = I - if (C.use(1)) - times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20) // "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] - assembled = 2 - user << "You wire the igniter to detonate the fuel." - desc = "A weak, improvised incendiary device." - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - name = "improvised firebomb" - active = 0 - det_time = text2num(pickweight(times)) - if(det_time < 0) //checking for 'duds' - range = 1 - det_time = rand(30,80) - else - range = pick(2,2,2,3,3,3,4) - else - user <<"span class='warning'>You need one length of cable to add an igniter." - return /obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // if(!active) @@ -79,7 +42,6 @@ active = 1 overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") icon_state = initial(icon_state) + "_active" - assembled = 3 add_fingerprint(user) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) @@ -99,5 +61,4 @@ /obj/item/weapon/grenade/iedcasing/examine(mob/user) ..() - if(assembled == 3) - user << "You can't tell when it will explode!" + user << "You can't tell when it will explode!" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index a273e6315fe..8118a8f4412 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -101,7 +101,7 @@ if(!C.handcuffed) playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) C.visible_message("[user] is trying to put zipties on [C]!", \ - "[user] is trying to put zipeties on [C]!") + "[user] is trying to put zipties on [C]!") if(do_mob(user, C, 30)) if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) @@ -117,7 +117,6 @@ trashtype = /obj/item/weapon/restraints/handcuffs/cable/zipties/used /obj/item/weapon/restraints/handcuffs/cable/zipties/used - name = "used zipties" desc = "A pair of broken zipties." icon_state = "cuff_white_used" diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 18b9563867c..6932525dd09 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -1,7 +1,9 @@ /obj/item/weapon/implant name = "implant" - icon = 'icons/obj/stock_parts.dmi' - icon_state = "rom"//Normally, you shouldn't see these. However, they can show up in the game via certain sources, like soul-stoning. + icon = 'icons/obj/implants.dmi' + icon_state = "generic" //Shows up as the action button icon + action_button_is_hands_free = 1 + var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants var/implanted = null var/mob/imp_in = null item_color = "b" @@ -15,11 +17,16 @@ /obj/item/weapon/implant/proc/activate() return +/obj/item/weapon/implant/ui_action_click() + activate("action_button") + //What does the implant do upon injection? //return 0 if the implant fails (ex. Revhead and loyalty implant.) //return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.) /obj/item/weapon/implant/proc/implanted(var/mob/source) + if(activated) + action_button_name = "Activate [src.name]" return 1 @@ -34,6 +41,7 @@ /obj/item/weapon/implant/tracking name = "tracking implant" desc = "Track with this." + activated = 0 var/id = 1.0 /obj/item/weapon/implant/tracking/get_data() @@ -58,6 +66,7 @@ /obj/item/weapon/implant/explosive name = "explosive implant" desc = "And boom goes the weasel." + icon_state = "explosive" /obj/item/weapon/implant/explosive/get_data() var/dat = {"Implant Specifications:
@@ -77,6 +86,8 @@ /obj/item/weapon/implant/explosive/activate(var/cause) if(!cause || !imp_in) return 0 + if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your explosive implant? This will cause you to explode and gib!", "Explosive Implant Confirmation", "Yes", "No") != "Yes") + return 0 explosion(src, -1, 0, 2, 3, 0) //This might be a bit much, dono will have to see. if(imp_in) imp_in.gib() @@ -85,6 +96,7 @@ /obj/item/weapon/implant/chem name = "chem implant" desc = "Injects things." + icon_state = "reagents" allow_reagents = 1 /obj/item/weapon/implant/chem/get_data() @@ -125,6 +137,7 @@ /obj/item/weapon/implant/loyalty name = "loyalty implant" desc = "Makes you loyal or such." + activated = 0 /obj/item/weapon/implant/loyalty/get_data() var/dat = {"Implant Specifications:
@@ -140,6 +153,7 @@ /obj/item/weapon/implant/loyalty/implanted(mob/target) + ..() if(target.mind in ticker.mode.head_revolutionaries) target.visible_message("[target] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!") return 0 @@ -152,6 +166,7 @@ /obj/item/weapon/implant/adrenalin name = "adrenal implant" desc = "Removes all stuns and knockdowns." + icon_state = "adrenal" var/uses = 3 /obj/item/weapon/implant/adrenalin/get_data() @@ -165,47 +180,29 @@ Integrity: Implant can only be used three times before reserves are depleted."} return dat -/obj/item/weapon/implant/adrenalin/trigger(emote, mob/source) +/obj/item/weapon/implant/adrenalin/activate() if(uses < 1) return 0 - if(emote == "scream") - uses-- - source << "You feel a sudden surge of energy!" - source.SetStunned(0) - source.SetWeakened(0) - source.SetParalysis(0) - source.lying = 0 - source.update_canmove() + uses-- + imp_in << "You feel a sudden surge of energy!" + imp_in.SetStunned(0) + imp_in.SetWeakened(0) + imp_in.SetParalysis(0) + imp_in.lying = 0 + imp_in.update_canmove() - source.reagents.add_reagent("synaptizine", 10) - source.reagents.add_reagent("tricordrazine", 10) - source.reagents.add_reagent("hyperzine", 10) - -/obj/item/weapon/implant/adrenalin/implanted(mob/source) - source.mind.store_memory("An adrenal implant can be activated [uses] time\s by using the scream emote, say *scream to attempt to activate.", 0, 0) - source << "The implanted adrenaline implant can be activated [uses] time\s by using the scream emote, say *scream to attempt to activate." - return 1 + imp_in.reagents.add_reagent("synaptizine", 10) + imp_in.reagents.add_reagent("tricordrazine", 10) + imp_in.reagents.add_reagent("hyperzine", 10) /obj/item/weapon/implant/emp name = "emp implant" desc = "Triggers an EMP." + icon_state = "emp" - var/activation_emote = "chuckle" var/uses = 2 -/obj/item/weapon/implant/emp/New() - activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "smile", "pale", "sniff", "whimper", "wink") - ..() - return - -/obj/item/weapon/implant/emp/trigger(emote, mob/living/carbon/source as mob) +/obj/item/weapon/implant/emp/activate() if (src.uses < 1) return 0 - if (emote == src.activation_emote) - src.uses-- - empulse(source, 3, 5) - return - -/obj/item/weapon/implant/emp/implanted(mob/living/carbon/source) - source.mind.store_memory("EMP implant can be activated [uses] time\s by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) - source << "The implanted EMP implant can be activated [uses] time\s by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate." - return 1 \ No newline at end of file + src.uses-- + empulse(imp_in, 3, 5) \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index fdf63866f6b..db9f3a17c06 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -3,52 +3,39 @@ /obj/item/weapon/implant/freedom name = "freedom implant" desc = "Use this to escape from those evil Red Shirts." + icon_state = "freedom" item_color = "r" - var/activation_emote = "chuckle" var/uses = 4.0 -/obj/item/weapon/implant/freedom/New() - src.activation_emote = "shrug" - src.uses = 4 - ..() - return - - -/obj/item/weapon/implant/freedom/trigger(emote, mob/living/carbon/source as mob) +/obj/item/weapon/implant/freedom/activate() if (src.uses < 1) return 0 - if (emote == src.activation_emote) - src.uses-- - source << "You feel a faint click." - if (source.handcuffed) - var/obj/item/weapon/W = source.handcuffed - source.handcuffed = null - source.update_inv_handcuffed(0) - if (source.client) - source.client.screen -= W + src.uses-- + imp_in << "You feel a faint click." + if(iscarbon(imp_in)) + var/mob/living/carbon/C_imp_in = imp_in + if (C_imp_in.handcuffed) + var/obj/item/weapon/W = C_imp_in.handcuffed + C_imp_in.handcuffed = null + C_imp_in.update_inv_handcuffed(0) + if (C_imp_in.client) + C_imp_in.client.screen -= W if (W) - W.loc = source.loc - dropped(source) + W.loc = C_imp_in.loc + W.dropped(C_imp_in) if (W) W.layer = initial(W.layer) - if (source.legcuffed) - var/obj/item/weapon/W = source.legcuffed - source.legcuffed = null - source.update_inv_legcuffed(0) - if (source.client) - source.client.screen -= W + if (C_imp_in.legcuffed) + var/obj/item/weapon/W = C_imp_in.legcuffed + C_imp_in.legcuffed = null + C_imp_in.update_inv_legcuffed(0) + if (C_imp_in.client) + C_imp_in.client.screen -= W if (W) - W.loc = source.loc - dropped(source) + W.loc = C_imp_in.loc + W.dropped(C_imp_in) if (W) W.layer = initial(W.layer) - return - - -/obj/item/weapon/implant/freedom/implanted(mob/living/carbon/source) - source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) - source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate." - return 1 /obj/item/weapon/implant/freedom/get_data() diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index e3cae95152e..74a2b365aa9 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -1,24 +1,20 @@ /obj/item/weapon/implant/uplink name = "uplink implant" desc = "Summon things." - var/activation_emote = "chuckle" + icon = 'icons/obj/radio.dmi' + icon_state = "radio" /obj/item/weapon/implant/uplink/New() - activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") hidden_uplink = new(src) hidden_uplink.uses = 10 ..() - return /obj/item/weapon/implant/uplink/implanted(mob/source) - activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") - source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) - source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate." + ..() hidden_uplink.uplink_owner="[source.key]" return 1 -/obj/item/weapon/implant/uplink/trigger(emote, mob/source as mob) - if(hidden_uplink && usr == source) // Let's not have another people activate our uplink - hidden_uplink.check_trigger(source, emote, activation_emote) - return \ No newline at end of file +/obj/item/weapon/implant/uplink/activate() + if(hidden_uplink) + hidden_uplink.check_trigger(imp_in) \ No newline at end of file diff --git a/code/game/objects/items/weapons/janisigns.dm b/code/game/objects/items/weapons/janisigns.dm new file mode 100644 index 00000000000..fa781dec768 --- /dev/null +++ b/code/game/objects/items/weapons/janisigns.dm @@ -0,0 +1,61 @@ +/obj/item/weapon/holosign_creator + name = "holographic sign projector" + desc = "A handy-dandy hologaphic projector that displays a janitorial sign." + icon = 'icons/obj/janitor.dmi' + icon_state = "signmaker" + item_state = "electronic" + force = 5 + w_class = 2 + throwforce = 0 + throw_speed = 3 + throw_range = 7 + origin_tech = "programming=3" + var/list/signs = list() + var/max_signs = 10 + +/obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag) + if(flag) + var/turf/T = get_turf(target) + var/obj/effect/overlay/holograph/H = locate() in T + if(H) + user << "You use [src] to destroy [H]." + qdel(H) + else + if(signs.len < max_signs) + H = new(get_turf(target)) + signs += H + user << "You create \a [H] with [src]." + else + user << "[src] is projecting at max capacity!" + +/obj/item/weapon/holosign_creator/attack(mob/living/carbon/human/M, mob/user) + return + +/obj/item/weapon/holosign_creator/attack_self(mob/user) + if(signs.len) + var/list/L = signs.Copy() + for(var/sign in L) + qdel(sign) + signs -= sign + user << "You clear all active holograms." + + +/obj/effect/overlay/holograph + name = "wet floor sign" + desc = "The words flicker as if they mean nothing." + icon = 'icons/obj/janitor.dmi' + icon_state = "holosign" + anchored = 1 + + +/obj/item/weapon/caution + desc = "Caution! Wet Floor!" + name = "wet floor sign" + icon = 'icons/obj/janitor.dmi' + icon_state = "caution" + force = 1.0 + throwforce = 3.0 + throw_speed = 2 + throw_range = 5 + w_class = 2.0 + attack_verb = list("warned", "cautioned", "smashed") diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index d82736e7200..67dae86b254 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -725,10 +725,21 @@ dat = {" + - - + +
You start skimming through the manual...
+ diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index a1071d7e1d7..66f46b0c758 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -83,18 +83,14 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ - "You extend the baton.",\ - "You hear an ominous click.") + user << "You extend the baton." icon_state = "telebaton_1" item_state = "nullrod" w_class = 4 //doesnt fit in backpack when its on for balance force = 10 //seclite damage attack_verb = list("smacked", "struck", "cracked", "beaten") else - user.visible_message("[user] collapses their telescopic baton.",\ - "You collapse the baton.",\ - "You hear a click.") + user << "You collapse the baton." icon_state = "telebaton_0" item_state = "telebaton_0" //no sprite in other words slot_flags = SLOT_BELT @@ -117,6 +113,11 @@ else user.take_organ_damage(2*force) return + if(isrobot(target)) + ..() + return + if(!isliving(target)) + return if (user.a_intent == "harm") if(!..()) return if(!isrobot(target)) return @@ -124,6 +125,7 @@ if(cooldown <= 0) playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1) target.Weaken(3) + add_logs(user, target, "stunned", object="telescopic baton") src.add_fingerprint(user) target.visible_message("[target] has been knocked down with \the [src] by [user]!") if(!iscarbon(user)) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 44c9b9dc921..d0e2a2ba6dd 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -11,10 +11,11 @@ attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") var/mopping = 0 var/mopcount = 0 - + var/mopcap = 5 + var/mopspeed = 40 /obj/item/weapon/mop/New() - create_reagents(5) + create_reagents(mopcap) obj/item/weapon/mop/proc/clean(turf/simulated/A) @@ -40,9 +41,9 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) A = null if(istype(turf)) - user.visible_message("[user] begins to clean \the [turf].") + user.visible_message("[user] begins to clean \the [turf] with [src].") - if(do_after(user, 40)) + if(do_after(user, mopspeed)) clean(turf) user << "You have finished mopping!" @@ -63,4 +64,12 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) /obj/item/weapon/mop/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J) return - +/obj/item/weapon/mop/advanced + desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!" + name = "advanced mop" + mopcap = 10 + icon_state = "advmop" + force = 6 + throwforce = 8 + throw_range = 4 + mopspeed = 20 \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 776dca795a5..0f09d860cca 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -62,6 +62,11 @@ crit_fail = 1 icon_state = "brokenpack" +/obj/item/weapon/storage/backpack/holding/singularity_act(current_size) + var/dist = max((current_size - 2),1) + explosion(src.loc,(dist),(dist*2),(dist*4)) + return + /obj/item/weapon/storage/backpack/santabag name = "Santa's Gift Bag" diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 6100e836582..7d9c1ec5575 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -34,7 +34,8 @@ w_class = 4 max_w_class = 2 - storage_slots = 21 + max_combined_w_class = 30 + storage_slots = 30 can_hold = list() // any cant_hold = list(/obj/item/weapon/disk/nuclear) @@ -96,13 +97,15 @@ desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant." icon_state = "portaseeder" - verb/dissolve_contents() - set name = "Activate Seed Extraction" - set category = "Object" - set desc = "Activate to convert your plants into plantable seeds." - for(var/obj/item/O in contents) - seedify(O, 1) - close_all() +/obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents() + set name = "Activate Seed Extraction" + set category = "Object" + set desc = "Activate to convert your plants into plantable seeds." + if(usr.stat || !usr.canmove || usr.restrained()) + return + for(var/obj/item/O in contents) + seedify(O, 1) + close_all() // ----------------------------- diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index bb45281340e..6e7efa8bf50 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -94,7 +94,8 @@ /obj/item/weapon/storage/pill_bottle, /obj/item/stack/medical, /obj/item/device/flashlight/pen, - /obj/item/weapon/extinguisher/mini + /obj/item/weapon/extinguisher/mini, + /obj/item/weapon/reagent_containers/hypospray ) @@ -111,7 +112,7 @@ /obj/item/weapon/grenade/flashbang, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/restraints/handcuffs, - /obj/item/device/flash, + /obj/item/device/flash/handheld, /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_box, @@ -196,5 +197,6 @@ /obj/item/device/lightreplacer, /obj/item/device/flashlight, /obj/item/weapon/reagent_containers/spray, - /obj/item/weapon/soap + /obj/item/weapon/soap, + /obj/item/weapon/holosign_creator ) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 225c52d6804..0fafce0d3a8 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -50,6 +50,11 @@ user.update_inv_r_hand() qdel(src) +/obj/item/weapon/storage/box/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/stack/packageWrap)) + return 0 + ..() + /obj/item/weapon/storage/box/survival @@ -119,6 +124,34 @@ new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src ) +/obj/item/weapon/storage/box/medipens + name = "box of medipens" + desc = "A box full of inaprovaline MediPens." + icon_state = "syringe" + +/obj/item/weapon/storage/box/medipens/New() + ..() + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) + +/obj/item/weapon/storage/box/medipens/utility + name = "medipens kit" + desc = "A box with several utility medipens for the economical miner." + icon_state = "syringe" + +/obj/item/weapon/storage/box/syringes/New() + ..() + new /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack( src ) + /obj/item/weapon/storage/box/beakers name = "box of beakers" icon_state = "beaker" @@ -146,20 +179,6 @@ new /obj/item/weapon/dnainjector/m2h(src) new /obj/item/weapon/dnainjector/m2h(src) -/*/obj/item/weapon/storage/box/blanks //Blanks removed, go home - name = "box of blank shells" - desc = "It has a picture of a gun and several warning symbols on the front." - -/obj/item/weapon/storage/box/blanks/New() - ..() - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src) - new /obj/item/ammo_casing/shotgun/blank(src)*/ - /obj/item/weapon/storage/box/flashbangs name = "box of flashbangs (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use." @@ -182,12 +201,12 @@ /obj/item/weapon/storage/box/flashes/New() ..() - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) /obj/item/weapon/storage/box/teargas name = "box of tear gas grenades (WARNING)" @@ -343,6 +362,19 @@ for(var/i = 1; i <= 5; i++) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src) + +/obj/item/weapon/storage/box/permits + name = "box of construction permits" + desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station." + icon_state = "id" + +/obj/item/weapon/storage/box/permits/New() //There's only a few, so blueprints are still useful beyond setting every room's name to PRIMARY FART STORAGE + ..() + new /obj/item/areaeditor/permit(src) + new /obj/item/areaeditor/permit(src) + new /obj/item/areaeditor/permit(src) + + /obj/item/weapon/storage/box/ids name = "box of spare IDs" desc = "Has so many empty IDs." diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 1e0414ff121..2535cb46f52 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -139,8 +139,8 @@ //CIG PACK// //////////// /obj/item/weapon/storage/fancy/cigarettes - name = "cigarette packet" - desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics." + name = "\improper Space Cigarettes packet" + desc = "The most popular brand of cigarettes, sponsors of the Space Olympics." icon = 'icons/obj/cigarettes.dmi' icon_state = "cigpacket" item_state = "cigpacket" @@ -190,6 +190,66 @@ icon_state = "Dpacket" item_state = "Dpacket" +/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift + name = "\improper Uplift Smooth packet" + desc = "Your favorite brand, now menthol flavored." + icon_state = "upliftpacket" + item_state = "upliftpacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust + name = "\improper Robust packet" + desc = "Smoked by the robust." + icon_state = "robustpacket" + item_state = "robustpacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold + name = "\improper Robust Gold packet" + desc = "Smoked by the truly robust." + icon_state = "robustgpacket" + item_state = "robustgpacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold/New() + ..() + for(var/i = 1 to storage_slots) + reagents.add_reagent("gold",0.2) + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp + name = "\improper Carp Classic packet" + desc = "Since 2313." + icon_state = "carppacket" + item_state = "carppacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate + name = "cigarette packet" + desc = "An obscure brand of cigarettes." + icon_state = "syndiepacket" + item_state = "syndiepacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate/New() + ..() + for(var/i = 1 to storage_slots) + reagents.add_reagent("doctorsdelight",15) + + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori + name = "\improper Midori Tabako packet" + desc = "You can't understand the runes, but the packet smells funny." + icon_state = "midoripacket" + item_state = "midoripacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims + name ="\improper Shady Jim's Super Slims" + desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!" + icon_state = "shadyjimpacket" + item_state = "shadyjimpacket" + +/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims/New() + ..() + for(var/i = 1 to storage_slots) + reagents.add_reagent("lipozine",4) + reagents.add_reagent("ammonia",2) + reagents.add_reagent("plantbgone",1) + reagents.add_reagent("toxin",1.5) /obj/item/weapon/storage/fancy/rollingpapers name = "rolling paper pack" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 2126b27b6ff..ec4770e255d 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -108,7 +108,7 @@ new /obj/item/weapon/reagent_containers/pill/bicaridine( src ) new /obj/item/weapon/reagent_containers/pill/dermaline( src ) new /obj/item/weapon/reagent_containers/syringe/lethal/choral( src ) - new /obj/item/clothing/glasses/hud/health( src ) + new /obj/item/clothing/glasses/hud/health/night( src ) return @@ -130,7 +130,7 @@ if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~ var/mob/M = usr - if (!( istype(over_object, /obj/screen) )) + if (!istype(over_object, /obj/screen) || !Adjacent(M)) return ..() if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/)) switch(over_object.name) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 3cc811137c4..bdf805d2b02 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -362,6 +362,9 @@ set name = "Switch Gathering Method" set category = "Object" + if(usr.stat || !usr.canmove || usr.restrained()) + return + collection_mode = (collection_mode+1)%3 switch (collection_mode) if(2) @@ -376,7 +379,7 @@ set name = "Empty Contents" set category = "Object" - if((!ishuman(usr) && (loc != usr)) || usr.stat || usr.restrained()) + if((!ishuman(usr) && (loc != usr)) || usr.stat || usr.restrained() ||!usr.canmove) return do_quick_empty() diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 0285eae77a8..f261c0aeb09 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -20,6 +20,8 @@ /obj/item/weapon/tank/jetpack/verb/toggle_rockets() set name = "Toggle Jetpack Stabilization" set category = "Object" + if(usr.stat || !usr.canmove || usr.restrained()) + return src.stabilization_on = !( src.stabilization_on ) usr << "You toggle the stabilization [stabilization_on? "on":"off"]." return @@ -28,6 +30,8 @@ /obj/item/weapon/tank/jetpack/verb/toggle() set name = "Toggle Jetpack" set category = "Object" + if(usr.stat || !usr.canmove || usr.restrained()) + return on = !on if(on) icon_state = "[icon_state]-on" diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index b82ff3b8939..8f02afd70fb 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -29,6 +29,8 @@ /obj/item/weapon/watertank/verb/toggle_mister() set name = "Toggle Mister" set category = "Object" + if(usr.stat || !usr.canmove || usr.restrained()) + return on = !on var/mob/living/carbon/human/user = usr diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 1592fcc692b..fc4b26368f2 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -117,7 +117,7 @@ /obj/item/weapon/wirecutters/attack(mob/living/carbon/C, mob/user) if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable)) user.visible_message("[user] cuts [C]'s restraints with [src]!") - qdel(C) + qdel(C.handcuffed) C.handcuffed = null C.update_inv_handcuffed(0) return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f45a8b5766f..c30b4ac122b 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -1,15 +1,10 @@ /obj languages = HUMAN //var/datum/module/mod //not used - var/m_amt = 0 // metal - var/g_amt = 0 // glass - var/origin_tech = null //Used by R&D to determine what research bonuses it grants. - var/reliability = 100 //Used by SOME devices to determine how reliable they are. var/crit_fail = 0 var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. animate_movement = 2 var/throwforce = 0 - var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING! var/damtype = "brute" @@ -134,3 +129,18 @@ var/obj/Loc=loc Loc.on_log() +/obj/singularity_act() + ex_act(1.0) + if(src && isnull(gc_destroyed)) + qdel(src) + return 2 + +/obj/singularity_pull(S, current_size) + if(anchored) + if(current_size >= STAGE_FIVE) + anchored = 0 + step_towards(src,S) + else step_towards(src,S) + +/obj/proc/Deconstruct() + qdel(src) \ No newline at end of file diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 54d65faa2b2..b76161c0d8a 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -1,11 +1,11 @@ -obj/structure +/obj/structure icon = 'icons/obj/structures.dmi' -obj/structure/blob_act() +/obj/structure/blob_act() if(prob(50)) qdel(src) -obj/structure/ex_act(severity) +/obj/structure/ex_act(severity) switch(severity) if(1.0) qdel(src) @@ -17,7 +17,7 @@ obj/structure/ex_act(severity) if(3.0) return -obj/structure/Destroy() +/obj/structure/Destroy() if(opacity) UpdateAffectingLights() ..() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index db1480e7ebd..c07ca884aea 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -14,6 +14,8 @@ var/wall_mounted = 0 //never solid (You can always pass over it) var/health = 100 var/lastbang + var/max_mob_size = 1 //Biggest mob_size accepted by the container + var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet. var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate //then open it in a populated area to crash clients. @@ -25,8 +27,8 @@ /obj/structure/closet/alter_health() return get_turf(src) -/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0 || wall_mounted)) return 1 +/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0) + if(height==0 || wall_mounted) return 1 return (!density) /obj/structure/closet/proc/can_open() @@ -82,8 +84,14 @@ if(istype(AM, /mob/living)) var/mob/living/L = AM - if(L.buckled) + if(L.buckled || L.mob_size > max_mob_size) //buckled mobs and mobs too big for the container don't get inside closets. return 0 + if(L.mob_size > 0) + var/mobs_stored = 0 + for(var/mob/living/M in contents) + mobs_stored++ + if(mobs_stored >= mob_storage_capacity) + return 0 if(L.client) L.client.perspective = EYE_PERSPECTIVE L.client.eye = src @@ -197,7 +205,7 @@ if(user.drop_item()) W.Move(loc) - else if(istype(W, /obj/item/weapon/packageWrap)) + else if(istype(W, /obj/item/stack/packageWrap)) return else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W @@ -312,8 +320,8 @@ return //Door's open, not locked or welded, no point in resisting. //okay, so the closet is either welded or locked... resist!!! - user.changeNext_move(100) - user.last_special = world.time + 100 + 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.)" for(var/mob/O in viewers(src)) O << "[src] begins to shake violently!" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 4452056525f..6af8f879705 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -77,7 +77,7 @@ new /obj/item/weapon/caution(src) new /obj/item/weapon/caution(src) new /obj/item/weapon/caution(src) - new /obj/item/weapon/caution(src) + new /obj/item/weapon/holosign_creator(src) new /obj/item/device/lightreplacer(src) new /obj/item/weapon/storage/bag/trash(src) new /obj/item/clothing/shoes/galoshes(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 649111df7cf..13e18c8e65b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -16,7 +16,8 @@ new /obj/item/weapon/storage/backpack/industrial(src) else new /obj/item/weapon/storage/backpack/satchel_eng(src) - new /obj/item/blueprints(src) + new /obj/item/areaeditor/blueprints(src) + new /obj/item/weapon/storage/box/permits(src) new /obj/item/clothing/under/rank/chief_engineer(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(src) @@ -29,7 +30,7 @@ new /obj/item/weapon/airlock_painter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/multitool(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) return /obj/structure/closet/secure_closet/engineering_electrical diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index fa3032ad889..90b2fa14b9a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -68,28 +68,14 @@ new /obj/item/weapon/storage/backpack/medic(src) else new /obj/item/weapon/storage/backpack/satchel_med(src) - new /obj/item/clothing/under/rank/nursesuit (src) - new /obj/item/clothing/head/nursehat (src) - switch(pick("blue", "green", "purple")) - if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) - if ("green") - new /obj/item/clothing/under/rank/medical/green(src) - if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) - switch(pick("blue", "green", "purple")) - if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) - if ("green") - new /obj/item/clothing/under/rank/medical/green(src) - if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/shoes/sneakers/white(src) -// new /obj/item/weapon/cartridge/medical(src) new /obj/item/device/radio/headset/headset_med(src) + new /obj/item/clothing/gloves/latex(src) + new /obj/item/weapon/defibrillator/loaded(src) new /obj/item/weapon/storage/belt/medical(src) + new /obj/item/clothing/glasses/hud/health(src) return @@ -113,14 +99,15 @@ new /obj/item/weapon/storage/backpack/satchel_med(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) - new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/suit/labcoat/cmo(src) - new /obj/item/weapon/cartridge/cmo(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/shoes/sneakers/brown (src) + new /obj/item/weapon/cartridge/cmo(src) new /obj/item/device/radio/headset/heads/cmo(src) + new /obj/item/clothing/gloves/latex(src) + new /obj/item/weapon/defibrillator/loaded(src) new /obj/item/weapon/storage/belt/medical(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/hypospray/CMO(src) return @@ -135,9 +122,9 @@ ..() sleep(2) new /obj/item/device/assembly/signaler(src) - new /obj/item/device/radio/electropack(src) - new /obj/item/device/radio/electropack(src) - new /obj/item/device/radio/electropack(src) + new /obj/item/device/electropack(src) + new /obj/item/device/electropack(src) + new /obj/item/device/electropack(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 9b0cef34c99..c477ef67812 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -37,8 +37,10 @@ sleep(2) new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) - new /obj/item/clothing/under/rank/research_director(src) new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/under/rank/research_director(src) + new /obj/item/clothing/under/rank/research_director/alt(src) + new /obj/item/clothing/under/rank/research_director/turtleneck(src) new /obj/item/weapon/cartridge/rd(src) new /obj/item/clothing/shoes/sneakers/white(src) new /obj/item/clothing/gloves/latex(src) @@ -46,7 +48,6 @@ new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/suit/armor/reactive(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/device/laser_pointer(src) - new /obj/item/clothing/under/rank/research_director/alt(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1b522da3be6..4903468b036 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -49,7 +49,7 @@ new /obj/item/weapon/storage/box/ids(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/weapon/mining_voucher(src) return @@ -70,8 +70,10 @@ ..() sleep(2) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/suit/armor/hos/jensen(src) - new /obj/item/clothing/head/HoS/dermal(src) + new /obj/item/clothing/under/hosformalfem(src) + new /obj/item/clothing/under/hosformalmale(src) + new /obj/item/clothing/suit/armor/hos/trenchcoat(src) + new /obj/item/clothing/head/HoS/drill(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos/alt(src) new /obj/item/clothing/glasses/hud/security/eyepatch(src) @@ -79,7 +81,7 @@ new /obj/item/weapon/shield/riot/tele(src) new /obj/item/clothing/mask/gas/sechailer/hos(src) new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/storage/belt/security(src) @@ -134,7 +136,7 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/mask/gas/sechailer(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/grenade/flashbang(src) new /obj/item/weapon/gun/energy/taser(src) @@ -247,7 +249,7 @@ var/id = null /obj/structure/closet/secure_closet/brig/New() - new /obj/item/clothing/under/color/orange( src ) + new /obj/item/clothing/under/rank/prisoner( src ) new /obj/item/clothing/shoes/sneakers/orange( src ) return diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index b0aa0ed0f45..ddc0b48b116 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -38,17 +38,6 @@ new /obj/item/clothing/head/beret/sec(src) return -/obj/structure/closet/wardrobe/hos - name = "\proper head of security's wardrobe" - icon_state = "red" - icon_closed = "red" - -/obj/structure/closet/wardrobe/hos/New() - new /obj/item/clothing/under/hosformalfem(src) - new /obj/item/clothing/under/hosformalmale(src) - new /obj/item/clothing/under/rank/head_of_security/jensen(src) - return - /obj/structure/closet/wardrobe/pink name = "pink wardrobe" icon_state = "pink" @@ -72,6 +61,8 @@ new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/under/color/black(src) + if(prob(25)) + new /obj/item/clothing/suit/jacket/leather(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/black(src) @@ -126,9 +117,9 @@ icon_closed = "orange" /obj/structure/closet/wardrobe/orange/New() - new /obj/item/clothing/under/color/orange(src) - new /obj/item/clothing/under/color/orange(src) - new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/rank/prisoner(src) + new /obj/item/clothing/under/rank/prisoner(src) + new /obj/item/clothing/under/rank/prisoner(src) new /obj/item/clothing/shoes/sneakers/orange(src) new /obj/item/clothing/shoes/sneakers/orange(src) new /obj/item/clothing/shoes/sneakers/orange(src) @@ -198,6 +189,22 @@ new /obj/item/clothing/shoes/sneakers/white(src) return +/obj/structure/closet/wardrobe/white/medical + name = "medical doctor's wardrobe" + +/obj/structure/closet/wardrobe/white/medical/New() + new /obj/item/clothing/under/rank/nursesuit (src) + new /obj/item/clothing/head/nursehat (src) + new /obj/item/clothing/suit/labcoat/emt(src) + new /obj/item/clothing/suit/labcoat/emt(src) + new /obj/item/clothing/suit/labcoat/emt(src) + new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/clothing/shoes/sneakers/black(src) + return /obj/structure/closet/wardrobe/pjs name = "pajama wardrobe" @@ -246,8 +253,8 @@ new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/black(src) - new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/gloves/fingerless(src) + new /obj/item/clothing/gloves/fingerless(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) return @@ -328,6 +335,10 @@ icon_closed = "mixed" /obj/structure/closet/wardrobe/mixed/New() + if(prob(25)) + new /obj/item/clothing/suit/jacket(src) + if(prob(25)) + new /obj/item/clothing/suit/jacket(src) new /obj/item/clothing/under/color/white(src) new /obj/item/clothing/under/color/blue(src) new /obj/item/clothing/under/color/yellow(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index bdf97295bab..53488cc89cb 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -273,7 +273,7 @@ if(opened) close() else - if(rigged && locate(/obj/item/device/radio/electropack) in src) + if(rigged && locate(/obj/item/device/electropack) in src) if(isliving(user)) var/mob/living/L = user if(L.electrocute_act(17, src)) @@ -333,7 +333,7 @@ return if(W) W.loc = src.loc - else if(istype(W, /obj/item/weapon/packageWrap)) + else if(istype(W, /obj/item/stack/packageWrap)) return else if(istype(W, /obj/item/stack/cable_coil)) if(rigged) @@ -346,7 +346,7 @@ else user << "You need 5 lengths of cable to rig [src]." return - else if(istype(W, /obj/item/device/radio/electropack)) + else if(istype(W, /obj/item/device/electropack)) if(rigged) user << "You attach [W] to [src]." user.drop_item() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 63817318c05..0c4558d1bac 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -85,16 +85,14 @@ user.changeNext_move(CLICK_CD_MELEE) if (src.destroyed && src.occupied) new /obj/item/weapon/gun/energy/laser/captain( src.loc ) - user << "\b You deactivate the hover field built into the case." + user << "You deactivate the hover field built into the case." src.occupied = 0 src.add_fingerprint(user) update_icon() return else - usr << text("You kick the display case.") - for(var/mob/O in oviewers()) - if ((O.client && !( O.blinded ))) - O << text("[] kicks the display case.", usr) + user.visible_message("[user] kicks the display case.", \ + "You kick the display case.") src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 6e309cd5c3a..08010e7d521 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -267,7 +267,7 @@ obj/structure/door_assembly/New() anchored = 1 density = 1 state = 1 - mineral = "clown" + mineral = "bananium" /obj/structure/door_assembly/door_assembly_sandstone name = "sandstone airlock assembly" diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 3029dae5487..622314f4456 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -12,11 +12,20 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user - var/new_undies = input(user, "Select your underwear", "Changing") as null|anything in underwear_all - if(!Adjacent(user))//no tele-grooming + var/choice = input(user, "Underwear or Undershirt?", "Changing") as null|anything in list("Underwear","Undershirt") + + if(!Adjacent(user)) return - if(new_undies) - H.underwear = new_undies + switch(choice) + if("Underwear") + var/new_undies = input(user, "Select your underwear", "Changing") as null|anything in underwear_list + if(new_undies) + H.underwear = new_undies + + if("Undershirt") + var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in undershirt_list + if(new_undershirt) + H.undershirt = new_undershirt add_fingerprint(H) H.update_body() \ No newline at end of file diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index bb0dc4486f6..0d0b1201ce9 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -7,6 +7,7 @@ anchored = 1 icon = 'icons/turf/walls.dmi' var/mineral = "metal" + var/walltype = "metal" var/opening = 0 density = 1 opacity = 1 @@ -31,20 +32,20 @@ /obj/structure/falsewall/relativewall() if(!density) - icon_state = "[mineral]fwall_open" + icon_state = "[walltype]fwall_open" return var/junction = 0 //will be used to determine from which side the wall is connected to other walls for(var/turf/simulated/wall/W in orange(src,1)) if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls - if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve + if(walltype == W.walltype)//Only 'like' walls connect -Sieve junction |= get_dir(src,W) for(var/obj/structure/falsewall/W in orange(src,1)) if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls - if(src.mineral == W.mineral) + if(walltype == W.walltype) junction |= get_dir(src,W) - icon_state = "[mineral][junction]" + icon_state = "[walltype][junction]" return /obj/structure/falsewall/attack_hand(mob/user) @@ -72,24 +73,24 @@ /obj/structure/falsewall/proc/do_the_flick() if(density) - flick("[mineral]fwall_opening", src) + flick("[walltype]fwall_opening", src) else - flick("[mineral]fwall_closing", src) + flick("[walltype]fwall_closing", src) /obj/structure/falsewall/update_icon(relativewall = 1)//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open if(density) - icon_state = "[mineral]0" + icon_state = "[walltype]0" if(relativewall) relativewall() else - icon_state = "[mineral]fwall_open" + icon_state = "[walltype]fwall_open" /obj/structure/falsewall/proc/ChangeToWall(delete = 1) var/turf/T = get_turf(src) - if(!mineral || mineral == "metal") + if(!walltype || walltype == "metal") T.ChangeTurf(/turf/simulated/wall) else - T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) + T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[walltype]")) if(delete) qdel(src) return T @@ -176,11 +177,11 @@ for(var/turf/simulated/wall/W in orange(src,1)) if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls - if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve + if(src.walltype == W.walltype)//Only 'like' walls connect -Sieve junction |= get_dir(src,W) for(var/obj/structure/falsewall/W in orange(src,1)) if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls - if(src.mineral == W.mineral) + if(src.walltype == W.walltype) junction |= get_dir(src,W) icon_state = "rwall[junction]" return @@ -194,6 +195,7 @@ desc = "A wall with uranium plating. This is probably a bad idea." icon_state = "" mineral = "uranium" + walltype = "uranium" var/active = null var/last_event = 0 @@ -226,24 +228,28 @@ desc = "A wall with gold plating. Swag!" icon_state = "" mineral = "gold" + walltype = "gold" /obj/structure/falsewall/silver name = "silver wall" desc = "A wall with silver plating. Shiny." icon_state = "" mineral = "silver" + walltype = "silver" /obj/structure/falsewall/diamond name = "diamond wall" desc = "A wall with diamond plating. You monster." icon_state = "" mineral = "diamond" + walltype = "diamond" /obj/structure/falsewall/plasma name = "plasma wall" desc = "A wall with plasma plating. This is definately a bad idea." icon_state = "" mineral = "plasma" + walltype = "plasma" /obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user) if(is_hot(W) > 300) @@ -268,17 +274,20 @@ name = "bananium wall" desc = "A wall with bananium plating. Honk!" icon_state = "" - mineral = "clown" + mineral = "bananium" + walltype = "clown" /obj/structure/falsewall/sandstone name = "sandstone wall" desc = "A wall with sandstone plating." icon_state = "" mineral = "sandstone" + walltype = "sandstone" //------------wtf?------------end /obj/structure/falsewall/wood name = "wooden wall" desc = "A wall with wooden plating." icon_state = "" - mineral = "wood" \ No newline at end of file + mineral = "wood" + walltype = "wood" \ No newline at end of file diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index f291ef114f2..e7cd91aaa60 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -198,7 +198,7 @@ ..() /obj/structure/flora/kirbyplants - name = "Potted plant" + name = "potted plant" icon = 'icons/obj/flora/plants.dmi' icon_state = "plant-01" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 514572d4e9b..cf2a205f65a 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,9 +1,11 @@ /obj/structure/girder + name = "girder" icon_state = "girder" anchored = 1 density = 1 layer = 2 var/state = 0 + var/girderpasschance = 20 // percentage chance that a projectile passes through the girder. /obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob) add_fingerprint(user) @@ -17,6 +19,9 @@ new /obj/item/stack/sheet/metal(get_turf(src)) qdel(src) else if(!anchored) + if (!istype(src.loc, /turf/simulated/floor)) + usr << "A floor must be present to secure the girder!" + return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "Now securing the girder..." if(do_after(user, 40)) @@ -68,6 +73,9 @@ qdel(src) else if(istype(W, /obj/item/stack/sheet)) + if (!istype(src.loc, /turf/simulated/floor)) + usr << "The girder is too unstable to build anything!" + return var/obj/item/stack/sheet/S = W switch(S.type) @@ -174,6 +182,17 @@ ..() +/obj/structure/girder/CanPass(atom/movable/mover, turf/target, height=0) + if(height==0) + return 1 + if(istype(mover) && mover.checkpass(PASSGRILLE)) + return prob(girderpasschance) + else + if(istype(mover, /obj/item/projectile)) + return prob(girderpasschance) + else + return 0 + /obj/structure/girder/blob_act() if(prob(40)) qdel(src) @@ -200,12 +219,16 @@ return /obj/structure/girder/displaced + name = "displaced girder" icon_state = "displaced" anchored = 0 + girderpasschance = 25 /obj/structure/girder/reinforced + name = "reinforced girder" icon_state = "reinforced" state = 2 + girderpasschance = 0 /obj/structure/cultgirder icon= 'icons/obj/cult.dmi' diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 340933e8184..69b2aaa5489 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -80,8 +80,8 @@ return -/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0)) return 1 +/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0) + if(height==0) return 1 if(istype(mover) && mover.checkpass(PASSGRILLE)) return 1 else @@ -227,3 +227,16 @@ health -= 1 healthcheck() ..() + +/obj/structure/grille/hitby(AM as mob|obj) + ..() + visible_message("[src] was hit by [AM].") + var/tforce = 0 + if(ismob(AM)) + tforce = 5 + else if(isobj(AM)) + var/obj/item/I = AM + tforce = I.throwforce - 5 + playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) + health = max(0, health - tforce) + healthcheck() \ No newline at end of file diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 0e6416867dd..22e008029e7 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -77,6 +77,12 @@ user << "[src] can't hold any more signs." else if(mybag) mybag.attackby(I, user) + else if(istype(I, /obj/item/weapon/crowbar)) + user.visible_message("[user] begins to empty the contents of [src].") + if(do_after(user, 30)) + usr << "You empty the contents of [src]'s bucket onto the floor." + reagents.reaction(src.loc) + src.reagents.clear_reagents() /obj/structure/janitorialcart/attack_hand(mob/user) user.set_machine(src) @@ -156,7 +162,7 @@ name = "janicart" icon = 'icons/obj/vehicles.dmi' icon_state = "pussywagon" - anchored = 1 + anchored = 0 density = 1 flags = OPENCONTAINER //copypaste sorry @@ -206,6 +212,8 @@ if(user.stat || user.stunned || user.weakened || user.paralysis) unbuckle() if(istype(user.l_hand, /obj/item/key) || istype(user.r_hand, /obj/item/key)) + if(!Process_Spacemove(direction)) + return step(src, direction) update_mob() handle_rotation() @@ -213,13 +221,6 @@ user << "You'll need the keys in one of your hands to drive this [callme]." -/obj/structure/stool/bed/chair/janicart/Move() - ..() - if(buckled_mob) - if(buckled_mob.buckled == src) - buckled_mob.loc = loc - - /obj/structure/stool/bed/chair/janicart/buckle_mob(mob/M, mob/user) if(M != user || !ismob(M) || get_dist(src, user) > 1 || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon)) return diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 69a6626d69a..b95ec7128c4 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -75,10 +75,8 @@ if (src.destroyed) return else - usr << text("You kick the lab cage.") - for(var/mob/O in oviewers()) - if ((O.client && !( O.blinded ))) - O << text("[] kicks the lab cage.", usr) + user.visible_message("[user] kicks the lab cage.", \ + "You kick the lab cage.") src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index e163f334470..0ce35f52907 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -55,8 +55,7 @@ /obj/structure/mineral_door/attack_hand(mob/user) return TryToSwitchState(user) -/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 +/obj/structure/mineral_door/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover, /obj/effect/beam)) return !opacity return !density diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index ba98fa3d0de..f5a22006542 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -25,7 +25,7 @@ CheckHardness() /obj/structure/statue/attack_hand(mob/user) - visible_message("[user] rubs some dust off from the [name]'s surface.") + visible_message("[user] rubs some dust off from the [name]'s surface.") /obj/structure/statue/CanAtmosPass() return !density @@ -236,7 +236,7 @@ /obj/structure/statue/bananium hardness = 3 - mineralType = "clown" + mineralType = "bananium" desc = "A bananium statue with a small engraving:'HOOOOOOONK'." /obj/structure/statue/bananium/clown diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 2437b38378b..29126839d37 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -12,8 +12,6 @@ "[user.name] pulls [buckled_mob.name] free from the sticky nest!",\ "[user.name] pulls you free from the gelatinous resin.",\ "You hear squelching...") - buckled_mob.pixel_y = 0 - buckled_mob.pixel_x = 0 unbuckle() /obj/structure/stool/bed/nest/unbuckle_myself(mob/user as mob) @@ -23,8 +21,6 @@ "You hear squelching...") spawn(600) if(user && buckled_mob && user.buckled == src) - buckled_mob.pixel_y = 0 - buckled_mob.pixel_x = 0 unbuckle() /obj/structure/stool/bed/nest/buckle_mob(mob/M as mob, mob/user as mob) @@ -49,14 +45,18 @@ M.loc = src.loc M.dir = src.dir M.update_canmove() - M.pixel_y = 1 - M.pixel_x = 2 + M.pixel_y += 1 + M.pixel_x += 2 + M.anchored = anchored src.buckled_mob = M src.add_fingerprint(user) src.overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=6) return /obj/structure/stool/bed/nest/unbuckle() + if(buckled_mob) + buckled_mob.pixel_y -= 1 + buckled_mob.pixel_x -= 2 overlays.Cut() ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 3b3e131ca64..4d23b413b99 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -22,6 +22,28 @@ unbuckle() ..() +/obj/structure/stool/bed/Move(atom/newloc, direct) //Some bed children move + . = ..() + if(buckled_mob) + buckled_mob.buckled = null + if(!buckled_mob.Move(loc, direct)) + loc = buckled_mob.loc //we gotta go back + last_move = buckled_mob.last_move + inertia_dir = last_move + buckled_mob.inertia_dir = last_move + . = 0 + buckled_mob.buckled = src + +/obj/structure/stool/bed/Process_Spacemove(var/movement_dir = 0) + if(buckled_mob) + return buckled_mob.Process_Spacemove(movement_dir) + return ..() + +/obj/structure/stool/bed/CanPass(atom/movable/mover, turf/target, height=1.5) + if(mover == buckled_mob) + return 1 + return ..() + /obj/structure/stool/bed/attack_paw(mob/user as mob) return src.attack_hand(user) @@ -49,9 +71,10 @@ buckled_mob.anchored = initial(buckled_mob.anchored) buckled_mob.update_canmove() - var/M = buckled_mob + var/mob/M = buckled_mob buckled_mob = null + M.newtonian_move(inertia_dir) afterbuckle(M) return @@ -106,6 +129,7 @@ "You are buckled in to [src] by [user.name].",\ "You hear metal clanking") M.buckled = src + M.anchored = anchored M.loc = src.loc M.dir = src.dir M.update_canmove() @@ -135,8 +159,28 @@ icon_state = "down" M.pixel_y -= buckled_pixel_y_offset -/obj/structure/stool/bed/roller/Move() + +/obj/item/roller + name = "roller bed" + desc = "A collapsed roller bed that can be carried around." + icon = 'icons/obj/rollerbed.dmi' + icon_state = "folded" + w_class = 4.0 // Can't be put in backpacks. + + +/obj/item/roller/attack_self(mob/user) + var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) + R.add_fingerprint(user) + qdel(src) + +/obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location) ..() - if(buckled_mob) - if(buckled_mob.buckled == src) - buckled_mob.loc = src.loc + if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src))) + if(!ishuman(usr)) + return + if(buckled_mob) + return 0 + visible_message("[usr] collapses \the [src.name].") + new/obj/item/roller(get_turf(src)) + qdel(src) + return \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 9053517eb9a..ad4f2705f56 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -4,20 +4,19 @@ icon_state = "chair" /obj/structure/stool/bed/chair/New() - if(anchored) - src.verbs -= /atom/movable/verb/pull ..() spawn(3) //sorry. i don't think there's a better way to do this. handle_layer() return +/obj/structure/stool/bed/chair/Move(atom/newloc, direct) + ..() + handle_rotation() + /obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/assembly/shock_kit)) var/obj/item/assembly/shock_kit/SK = W - if(!SK.status) - user << "[SK] is not ready to be attached!" - return user.drop_item() var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -33,10 +32,10 @@ rotate() return -/obj/structure/stool/bed/chair/proc/handle_rotation(direction) //making this into a seperate proc so office chairs can call it on Move() +/obj/structure/stool/bed/chair/proc/handle_rotation(direction) if(buckled_mob) buckled_mob.buckled = null //Temporary, so Move() succeeds. - if(!buckled_mob.Move(direction)) + if(!direction || !buckled_mob.Move(get_step(src, direction), direction)) buckled_mob.buckled = src dir = buckled_mob.dir return 0 @@ -65,7 +64,7 @@ else if(!usr || !isturf(usr.loc)) return - if(usr.stat || usr.restrained()) + if(usr.stat || usr.restrained() || !usr.canmove) return spin() @@ -130,11 +129,6 @@ /obj/structure/stool/bed/chair/office anchored = 0 -/obj/structure/stool/bed/chair/office/Move(direction) - if(handle_rotation(direction)) - ..() - handle_layer() - /obj/structure/stool/bed/chair/office/light icon_state = "officechair_white" diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 824a2b99e54..82b9f69e9bd 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -11,125 +11,6 @@ * Tables */ -/datum/table_recipe - var/name = "" - var/reqs[] = list() - var/result_path - var/tools[] = list() - var/time = 0 - var/parts[] = list() - var/chem_catalists[] = list() - -/datum/table_recipe/IED - name = "IED" - result_path = /obj/item/weapon/grenade/iedcasing - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, - /obj/item/stack/cable_coil = 1, - /obj/item/device/assembly/igniter = 1, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1, - /datum/reagent/fuel = 10) - time = 80 - -/datum/table_recipe/stunprod - name = "Stunprod" - result_path = /obj/item/weapon/melee/baton/cattleprod - reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1, - /obj/item/stack/rods = 1, - /obj/item/weapon/wirecutters = 1, - /obj/item/weapon/stock_parts/cell = 1) - time = 80 - parts = list(/obj/item/weapon/stock_parts/cell = 1) - -/datum/table_recipe/ed209 - name = "ED209" - result_path = /obj/machinery/bot/ed209 - reqs = list(/obj/item/robot_parts/robot_suit = 1, - /obj/item/clothing/head/helmet = 1, - /obj/item/clothing/suit/armor/vest = 1, - /obj/item/robot_parts/l_leg = 1, - /obj/item/robot_parts/r_leg = 1, - /obj/item/stack/sheet/metal = 5, - /obj/item/stack/cable_coil = 5, - /obj/item/weapon/gun/energy/taser = 1, - /obj/item/weapon/stock_parts/cell = 1, - /obj/item/device/assembly/prox_sensor = 1, - /obj/item/robot_parts/r_arm = 1) - tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver) - time = 120 - -/datum/table_recipe/secbot - name = "Secbot" - result_path = /obj/machinery/bot/secbot - reqs = list(/obj/item/device/assembly/signaler = 1, - /obj/item/clothing/head/helmet = 1, - /obj/item/weapon/melee/baton = 1, - /obj/item/device/assembly/prox_sensor = 1, - /obj/item/robot_parts/r_arm = 1) - tools = list(/obj/item/weapon/weldingtool) - time = 120 - -/datum/table_recipe/cleanbot - name = "Cleanbot" - result_path = /obj/machinery/bot/cleanbot - reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1, - /obj/item/device/assembly/prox_sensor = 1, - /obj/item/robot_parts/r_arm = 1) - time = 80 - -/datum/table_recipe/floorbot - name = "Floorbot" - result_path = /obj/machinery/bot/floorbot - reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1, - /obj/item/stack/tile/plasteel = 1, - /obj/item/device/assembly/prox_sensor = 1, - /obj/item/robot_parts/r_arm = 1) - time = 80 - -/datum/table_recipe/medbot - name = "Medbot" - result_path = /obj/machinery/bot/medbot - reqs = list(/obj/item/device/healthanalyzer = 1, - /obj/item/weapon/storage/firstaid = 1, - /obj/item/device/assembly/prox_sensor = 1, - /obj/item/robot_parts/r_arm = 1) - time = 80 - -/datum/table_recipe/flamethrower - name = "Flamethrower" - result_path = /obj/item/weapon/flamethrower - reqs = list(/obj/item/weapon/weldingtool = 1, - /obj/item/device/assembly/igniter = 1, - /obj/item/stack/rods = 2) - tools = list(/obj/item/weapon/screwdriver) - time = 20 - -/datum/table_recipe/meteorshot - name = "Meteorshot Shell" - result_path = /obj/item/ammo_casing/shotgun/meteorshot - reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/rcd_ammo = 1, - /obj/item/weapon/stock_parts/manipulator = 2) - tools = list(/obj/item/weapon/screwdriver) - time = 5 - -/datum/table_recipe/pulseslug - name = "Pulse Slug Shell" - result_path = /obj/item/ammo_casing/shotgun/pulseslug - reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /obj/item/weapon/stock_parts/capacitor/adv = 2, - /obj/item/weapon/stock_parts/micro_laser/ultra = 1) - tools = list(/obj/item/weapon/screwdriver) - time = 5 - -/datum/table_recipe/dragonsbreath - name = "Dragonsbreath Shell" - result_path = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath - reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, - /datum/reagent/phosphorus = 5,) - tools = list(/obj/item/weapon/screwdriver) - time = 5 - - /obj/structure/table name = "table" desc = "A square piece of metal standing on four metal legs. It can not move." @@ -140,7 +21,6 @@ layer = 2.8 throwpass = 1 //You can throw objects over this, despite it's density.") var/parts = /obj/item/weapon/table_parts - var/list/table_contents = list() var/busy = 0 /obj/structure/table/New() @@ -161,168 +41,6 @@ T.update_icon() ..() -/obj/structure/table/MouseDrop(atom/over) - if(usr.stat || usr.lying || !Adjacent(usr) || (over != usr)) - return - interact(usr) - -/obj/structure/table/proc/check_contents(datum/table_recipe/R) - check_table() - main_loop: - for(var/A in R.reqs) - for(var/B in table_contents) - if(ispath(B, A)) - if(table_contents[B] >= R.reqs[A]) - continue main_loop - return 0 - for(var/A in R.chem_catalists) - if(table_contents[A] < R.chem_catalists[A]) - return 0 - return 1 - -/obj/structure/table/proc/check_table() - table_contents = list() - for(var/obj/item/I in loc) - if(istype(I, /obj/item/stack)) - var/obj/item/stack/S = I - table_contents[I.type] += S.amount - else - if(istype(I, /obj/item/weapon/reagent_containers)) - for(var/datum/reagent/R in I.reagents.reagent_list) - table_contents[R.type] += R.volume - - table_contents[I.type] += 1 - -/obj/structure/table/proc/check_tools(mob/user, datum/table_recipe/R) - if(!R.tools.len) - return 1 - var/list/possible_tools = list() - for(var/obj/item/I in user.contents) - if(istype(I, /obj/item/weapon/storage)) - for(var/obj/item/SI in I.contents) - possible_tools += SI.type - else - possible_tools += I.type - possible_tools += table_contents - var/i = R.tools.len - var/I - for(var/A in R.tools) - I = possible_tools.Find(A) - if(I) - possible_tools.Cut(I, I+1) - i-- - else - break - return !i - -/obj/structure/table/proc/construct_item(mob/user, datum/table_recipe/R) - check_table() - if(check_contents(R) && check_tools(user, R)) - if(do_after(user, R.time)) - if(!check_contents(R) || !check_tools(user, R)) - return 0 - var/list/parts = del_reqs(R) - var/atom/movable/I = new R.result_path - for(var/A in parts) - if(istype(A, /obj/item)) - var/atom/movable/B = A - B.loc = I - else - if(!I.reagents) - I.reagents = new /datum/reagents() - I.reagents.reagent_list.Add(A) - I.CheckParts() - I.loc = loc - return 1 - return 0 - -/obj/structure/table/proc/del_reqs(datum/table_recipe/R) - var/list/Deletion = list() - var/amt - for(var/A in R.reqs) - amt = R.reqs[A] - if(ispath(A, /obj/item/stack)) - var/obj/item/stack/S - stack_loop: - for(var/B in table_contents) - if(ispath(B, A)) - while(amt > 0) - S = locate(B) in loc - if(S.amount >= amt) - S.use(amt) - break stack_loop - else - amt -= S.amount - qdel(S) - else if(ispath(A, /obj/item)) - var/obj/item/I - item_loop: - for(var/B in table_contents) - if(ispath(B, A)) - while(amt > 0) - I = locate(B) in loc - Deletion.Add(I) - I.loc = null //remove it from the table loc so that we don't locate the same item every time (will be relocated inside the crafted item in construct_item()) - amt-- - break item_loop - else - var/datum/reagent/RG = new A - reagent_loop: - for(var/B in table_contents) - if(ispath(B, /obj/item/weapon/reagent_containers)) - var/obj/item/RC = locate(B) in loc - if(RC.reagents.has_reagent(RG.id, amt)) - RC.reagents.remove_reagent(RG.id, amt) - RG.volume = amt - Deletion.Add(RG) - break reagent_loop - else if(RC.reagents.has_reagent(RG.id)) - Deletion.Add(RG) - RG.volume += RC.reagents.get_reagent_amount(RG.id) - amt -= RC.reagents.get_reagent_amount(RG.id) - RC.reagents.del_reagent(RG.id) - - for(var/A in R.parts) - for(var/B in Deletion) - if(!istype(B, A)) - Deletion.Remove(B) - qdel(B) - - return Deletion - -/obj/structure/table/interact(mob/user) - check_table() - if(!table_contents.len) - return - var/dat = "Construction menu
" - dat += ""
- if(busy)
- dat += "Construction in progress...
"
- else
- for(var/datum/table_recipe/R in table_recipes)
- if(check_contents(R))
- dat += "[R.name]" - dat += "
" dat+="\[Story by [MESSAGE.author]\]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]:
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + dat+="
" dat+="
Refresh" dat+="
Back" if(10) @@ -287,6 +291,9 @@ var/global/floorIsLava = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
" @@ -300,7 +307,6 @@ var/global/floorIsLava = 0 else for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" - dat+="
Back" if(14) dat+="Wanted Issue Handler:" @@ -794,26 +800,39 @@ var/global/floorIsLava = 0 if(!ai_number) usr << "No AIs located" //Just so you know the thing is actually working and not just ignoring you. -/datum/admins/proc/list_free_slots() +/datum/admins/proc/manage_free_slots() if(!check_rights()) return - var/dat = "
" + if(job.total_positions <= 0) + dat += "[J_title]: [J_opPos]" + else + dat += "[J_title]: [J_opPos]/[J_totPos]" + if(initial(job.total_positions) > 0) + dat += " Add | " + if(job.total_positions > job.current_positions) + dat += "Remove" + else + dat += "Remove" + dat += "
" dat += "" var/winheight = 100 + (count * 20) winheight = min(winheight, 690) usr << browse(dat, "window=players;size=316x[winheight]") - - // // //ALL DONE diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 5af2ebb0d14..b9e4b830b69 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -22,12 +22,12 @@ F << "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity") ) +/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo") ) set name = "Investigate" set category = "Admin" if(!holder) return switch(subject) - if("singulo", "ntsl", "wires", "telesci", "gravity") //general one-round-only stuff + if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 32a874d0f51..7fc699f736a 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -222,6 +222,10 @@ var/list/admin_ranks = list() //list of all admin_rank datums if("remove") if(alert("Are you sure you want to remove [adm_ckey]?","Message","Yes","Cancel") == "Yes") if(!D) return + if(!check_if_greater_rights_than_holder(D)) + message_admins("[key_name_admin(usr)] attempted to remove [adm_ckey] from the admins list without sufficient rights.") + log_admin("[key_name(usr)] attempted to remove [adm_ckey] from the admins list without sufficient rights.") + return admin_datums -= adm_ckey D.disassociate() @@ -244,6 +248,12 @@ var/list/admin_ranks = list() //list of all admin_rank datums new_rank = ckeyEx(input("Please input a new rank", "New custom rank", null, null) as null|text) if(!new_rank) return + if(D) + if(!check_if_greater_rights_than_holder(D)) + message_admins("[key_name_admin(usr)] attempted to change the rank of [adm_ckey] to [new_rank] without sufficient rights.") + log_admin("[key_name(usr)] attempted to change the rank of [adm_ckey] to [new_rank] without sufficient rights.") + return + R = rank_names[new_rank] if(!R) //rank with that name doesn't exist yet - make it if(D) R = new(new_rank, D.rank.rights, D.rank.adds, D.rank.subs) //duplicate our previous admin_rank but with a new name @@ -269,6 +279,11 @@ var/list/admin_ranks = list() //list of all admin_rank datums var/keyword = input("Input permission keyword (one at a time):\ne.g. +BAN or -FUN or +/client/proc/someverb", "Permission toggle", null, null) as null|text if(!keyword) return + if(!check_if_greater_rights_than_holder(D)) + message_admins("[key_name_admin(usr)] attempted to give [adm_ckey] the keyword [keyword] without sufficient rights.") + log_admin("[key_name(usr)] attempted to give [adm_ckey] the keyword [keyword] without sufficient rights.") + return + D.disassociate() if(!findtext(D.rank.name, "([adm_ckey])")) //not a modified subrank, need to duplicate the admin_rank datum to prevent modifying others too diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b7bd3c8019c..9edbb034971 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -14,6 +14,7 @@ var/list/admin_verbs_default = list( /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/secrets, /client/proc/reload_admins, + /client/proc/reestablish_db_connection,/*reattempt a connection to the database*/ /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel /*admin-pm list*/ ) @@ -56,7 +57,8 @@ var/list/admin_verbs_admin = list( /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_create_centcom_report, - /client/proc/check_words /*displays cult-words*/ + /client/proc/check_words, /*displays cult-words*/ + /client/proc/reset_all_tcs /*resets all telecomms scripts*/ ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -184,7 +186,9 @@ var/list/admin_verbs_hideable = list( /client/proc/cmd_debug_del_all, /client/proc/enable_debug_verbs, /proc/possess, - /proc/release + /proc/release, + /client/proc/reload_admins, + /client/proc/reset_all_tcs ) /client/proc/add_admin_verbs() diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm index 991fa9ad362..be59efff4f7 100644 --- a/code/modules/admin/banappearance.dm +++ b/code/modules/admin/banappearance.dm @@ -99,7 +99,7 @@ proc/DB_ban_isappearancebanned(var/playerckey) if(!dbcon.IsConnected()) return - var/sqlplayerckey = sql_sanitize_text(ckey(playerckey)) + var/sqlplayerckey = sanitizeSQL(ckey(playerckey)) var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("ban")] WHERE CKEY = '[sqlplayerckey]' AND ((bantype = 'APPEARANCE_PERMABAN') OR (bantype = 'APPEARANCE_TEMPBAN' AND expiration_time > Now())) AND unbanned != 1") query.Execute() diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index eb1445669f5..8b289da6f70 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -40,6 +40,16 @@ var/list/admin_datums = list() owner.holder = null owner = null +/datum/admins/proc/check_if_greater_rights_than_holder(datum/admins/other) + if(!other) + return 1 //they have no rights + if(rank.rights == 65535) + return 1 //we have all the rights + if(rank.rights != other.rank.rights) + if( (rank.rights & other.rank.rights) == other.rank.rights ) + return 1 //we have all the rights they have and more + return 0 + /* checks if usr is an admin with at least ONE of the flags in rights_required. (Note, they don't need all the flags) if rights_required == 0, then it simply checks if they are an admin. @@ -68,13 +78,9 @@ you will have to do something like if(client.rights & R_ADMIN) yourself. if(usr.client.holder) if(!other || !other.holder) return 1 - if(usr.client.holder.rank.rights != other.holder.rank.rights) //Check values smaller than 65536 - if( (usr.client.holder.rank.rights & other.holder.rank.rights) == other.holder.rank.rights ) - return 1 //we have all the rights they have and more - usr << "Error: Cannot proceed. They have greater or equal rights to us." + return usr.client.holder.check_if_greater_rights_than_holder(other.holder) return 0 - /client/proc/deadmin() admin_datums -= ckey if(holder) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 5c9228af8c0..c53410e4e0f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -680,7 +680,6 @@ if(!temp) continue joblist += temp.title if("nonhumandept") - joblist += "pAI" for(var/jobPos in nonhuman_positions) if(!jobPos) continue var/datum/job/temp = job_master.GetJob(jobPos) @@ -785,6 +784,7 @@ var/mob/M = locate(href_list["boot2"]) if (ismob(M)) if(!check_if_greater_rights_than(M.client)) + usr << "Error: They have more rights than you do." return M << "You have been kicked from the server." log_admin("[key_name(usr)] booted [key_name(M)].") @@ -1325,6 +1325,30 @@ src.owner << "[special_role_description]" src.owner << "(PM) (PP) (VV) (SM) (JMP) (CA)" + else if(href_list["addjobslot"]) + if(!check_rights(R_ADMIN)) return + + var/Add = href_list["addjobslot"] + + for(var/datum/job/job in job_master.occupations) + if(job.title == Add) + job.total_positions += 1 + break + + src.manage_free_slots() + + else if(href_list["removejobslot"]) + if(!check_rights(R_ADMIN)) return + + var/Remove = href_list["removejobslot"] + + for(var/datum/job/job in job_master.occupations) + if(job.title == Remove && job.total_positions - job.current_positions > 0) + job.total_positions -= 1 + break + + src.manage_free_slots() + else if(href_list["adminspawncookie"]) if(!check_rights(R_ADMIN|R_FUN)) return @@ -2249,3 +2273,15 @@ else if(href_list["ac_set_signature"]) src.admincaster_signature = adminscrub(input(usr, "Provide your desired signature", "Network Identity Handler", "")) src.access_news_network() + + else if(href_list["ac_del_comment"]) + var/datum/feed_comment/FC = locate(href_list["ac_del_comment"]) + var/datum/feed_message/FM = locate(href_list["ac_del_comment_msg"]) + FM.comments -= FC + qdel(FC) + src.access_news_network() + + else if(href_list["ac_lock_comment"]) + var/datum/feed_message/FM = locate(href_list["ac_lock_comment"]) + FM.locked ^= 1 + src.access_news_network() diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 70af98fa0dd..8ec3e3f2075 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -21,8 +21,8 @@ /client/proc/SDQL2_query(query_text as message) set category = "Debug" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. - message_admins("ERROR: Non-admin [usr.key] attempted to execute a SDQL query!") - log_admin("Non-admin [usr.key] attempted to execute a SDQL query!") + message_admins("ERROR: Non-admin [key_name(usr, usr.client)] attempted to execute a SDQL query!") + log_admin("Non-admin [usr.ckey]([usr]) attempted to execute a SDQL query!") if(!query_text || length(query_text) < 1) return @@ -40,10 +40,12 @@ return - var/query_log = "[usr] executed SDQL query: \"[query_text]\"." - world.log << query_log - message_admins(query_log) + var/query_log = "executed SDQL query: \"[query_text]\"." + message_admins("[key_name_admin(usr)] [query_log]") + query_log = "[usr.ckey]([usr]) [query_log]" log_game(query_log) + NOTICE(query_log) + for(var/list/query_tree in querys) var/list/from_objs = list() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index a5e4f9e9ac4..baa7c73549f 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -384,30 +384,6 @@ var/global/list/g_fancy_list_of_types = null g_fancy_list_of_types[typename] = type return g_fancy_list_of_types -var/global/list/g_fancy_list_of_safe_types = null -/proc/get_fancy_list_of_safe_types() - if (isnull(g_fancy_list_of_safe_types)) //init - var/blocked = list( - /turf, - /obj, - /mob, - /mob/living, - /mob/living/carbon, - /mob/living/carbon/human, - /mob/dead, - /mob/dead/observer, - /mob/living/silicon, - /mob/living/silicon/robot, - /mob/living/silicon/ai - ) - var/list/source = get_fancy_list_of_types() - g_fancy_list_of_safe_types = new - for(var/typename in source) - var/type = source[typename] - if(!(type in blocked)) - g_fancy_list_of_safe_types[typename] = type - return g_fancy_list_of_safe_types - /proc/filter_fancy_list(list/L, filter as text) var/list/matches = new for(var/key in L) @@ -421,8 +397,7 @@ var/global/list/g_fancy_list_of_safe_types = null set category = "Debug" set name = "Del-All" - // usng "safe" to prevent REALLY stupid deletions - var/list/matches = get_fancy_list_of_safe_types() + var/list/matches = get_fancy_list_of_types() if (!isnull(object) && object!="") matches = filter_fancy_list(matches, object) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 19db9821666..4a5110e6016 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -62,6 +62,9 @@ client/proc/one_click_antag() if(config.protect_roles_from_antagonist) temp.restricted_jobs += temp.protected_jobs + if(config.protect_assistant_from_antagonist) + temp.restricted_jobs += "Assistant" + var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null @@ -94,6 +97,9 @@ client/proc/one_click_antag() if(config.protect_roles_from_antagonist) temp.restricted_jobs += temp.protected_jobs + if(config.protect_assistant_from_antagonist) + temp.restricted_jobs += "Assistant" + var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null @@ -124,6 +130,9 @@ client/proc/one_click_antag() if(config.protect_roles_from_antagonist) temp.restricted_jobs += temp.protected_jobs + if(config.protect_assistant_from_antagonist) + temp.restricted_jobs += "Assistant" + var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null @@ -189,6 +198,9 @@ client/proc/one_click_antag() if(config.protect_roles_from_antagonist) temp.restricted_jobs += temp.protected_jobs + if(config.protect_assistant_from_antagonist) + temp.restricted_jobs += "Assistant" + var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null @@ -391,6 +403,9 @@ client/proc/one_click_antag() if(config.protect_roles_from_antagonist) temp.restricted_jobs += temp.protected_jobs + if(config.protect_assistant_from_antagonist) + temp.restricted_jobs += "Assistant" + var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 1b2c4bdf428..c9ff2d065b9 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -12,7 +12,7 @@ var/datum/objective/steal/steal_objective = new steal_objective.owner = H.mind - steal_objective.set_target("nuclear authentication disk") + steal_objective.set_target(new /datum/objective_item/steal/nukedisc) H.mind.objectives += steal_objective var/datum/objective/hijack/hijack_objective = new diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 7841ef4e761..b7131a68b98 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -29,10 +29,10 @@ /proc/Centcomm_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = " CENTCOM:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg = " CENTCOM:[key_name(Sender, 1)] (?) (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" admins << msg /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "SYNDICATE:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg = "SYNDICATE:[key_name(Sender, 1)] (?) (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" admins << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1e63312b6f2..74655bac1fa 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -449,13 +449,13 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_list_open_jobs() set category = "Admin" - set name = "List free slots" + set name = "Manage Job Slots" if (!holder) src << "Only administrators may use this command." return - holder.list_free_slots() - feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + holder.manage_free_slots() + feedback_add_details("admin_verb","MFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) set category = "Special Verbs" @@ -766,3 +766,21 @@ Traitors and the like can also be revived with the previous role mostly intact. usr << "Random events disabled" message_admins("Admin [key_name_admin(usr)] has disabled random events.") feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + +/client/proc/reset_all_tcs() + set category = "Admin" + set name = "Reset Telecomms Scripts" + set desc = "Blanks all telecomms scripts from all telecomms servers" + if(!holder) + usr << "Admin only." + return + for(var/obj/machinery/telecomms/server/S in telecomms_list) + var/datum/TCS_Compiler/C = S.Compiler + S.rawcode = "" + C.Compile("") + for(var/obj/machinery/computer/telecomms/traffic/T in machines) + T.storedcode = "" + log_admin("[key_name(usr)] blanked all telecomms scripts.") + message_admins("[key_name_admin(usr)] blanked all telecomms scripts.") + feedback_add_details("admin_verb","RAT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm new file mode 100644 index 00000000000..146b8481a19 --- /dev/null +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -0,0 +1,31 @@ +/client/proc/reestablish_db_connection() + set category = "Special Verbs" + set name = "Reestablish DB Connection" + if (!config.sql_enabled) + usr << "The Database is not enabled!" + return + + if (dbcon && dbcon.IsConnected()) + if (!check_rights(R_DEBUG,0)) + alert("The database is already connected! (Only those with +debug can force a reconnection)", "The database is already connected!") + return + + var/reconnect = alert("The database is already connected! If you *KNOW* that this is incorrect, you can force a reconnection", "The database is already connected!", "Force Reconnect", "Cancel") + if (reconnect != "Force Reconnect") + return + + dbcon.Disconnect() + failed_db_connections = 0 + log_admin("[key_name(usr)] has forced the database to disconnect") + message_admins("[key_name_admin(usr)] has forced the database to disconnect!") + feedback_add_details("admin_verb","FRDB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + log_admin("[key_name(usr)] is attempting to re-established the DB Connection") + message_admins("[key_name_admin(usr)] is attempting to re-established the DB Connection") + feedback_add_details("admin_verb","RDB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + failed_db_connections = 0 + if (!establish_db_connection()) + message_admins("Database connection failed: " + dbcon.ErrorMsg()) + else + message_admins("Database connection re-established") \ No newline at end of file diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 4b7d57e45ca..5bcc194d824 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -130,6 +130,9 @@ set category = "Object" set src in usr + if(usr.stat || !usr.canmove || usr.restrained()) + return + dir = turn(dir, 90) return diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 84825acd7e3..b1c79da69d4 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -4,8 +4,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "shock_kit" var/obj/item/clothing/head/helmet/part1 = null - var/obj/item/device/radio/electropack/part2 = null - var/status = 0 + var/obj/item/device/electropack/part2 = null w_class = 5.0 flags = CONDUCT @@ -16,7 +15,7 @@ return /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/wrench) && !status) + if(istype(W, /obj/item/weapon/wrench)) var/turf/T = loc if(ismob(T)) T = T.loc @@ -28,15 +27,12 @@ part2 = null qdel(src) return - if(istype(W, /obj/item/weapon/screwdriver)) - status = !status - user << "[src] is now [status ? "secured" : "unsecured"]!" add_fingerprint(user) return /obj/item/assembly/shock_kit/attack_self(mob/user as mob) - part1.attack_self(user, status) - part2.attack_self(user, status) + part1.attack_self(user) + part2.attack_self(user) add_fingerprint(user) return diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index d46487da15b..c970cd62d5f 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -134,7 +134,8 @@ Code: if(signal.encryption != code) return 0 if(!(src.wires & WIRE_RADIO_RECEIVE)) return 0 pulse(1) - src.loc.audible_message("\icon[src] *beep* *beep*", null, 1) + if(src.loc) + src.loc.audible_message("\icon[src] *beep* *beep*", null, 1) return @@ -177,7 +178,10 @@ Code: item_state = "electronic" /obj/item/device/assembly/signaler/anomaly/receive_signal(datum/signal/signal) - ..() + if(!signal) + return 0 + if(signal.encryption != code) + return 0 for(var/obj/effect/anomaly/A in orange(0, src)) A.anomalyNeutralize() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 2a4c7b7a2ef..713ed323fec 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -226,7 +226,7 @@ /obj/effect/landmark/corpse/miner corpseradio = /obj/item/device/radio/headset/headset_cargo corpseuniform = /obj/item/clothing/under/rank/miner - corpsegloves = /obj/item/clothing/gloves/black + corpsegloves = /obj/item/clothing/gloves/fingerless corpseback = /obj/item/weapon/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/sneakers/black corpseid = 1 diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm index 5f59848bf65..731c7faf252 100644 --- a/code/modules/awaymissions/exile.dm +++ b/code/modules/awaymissions/exile.dm @@ -13,6 +13,7 @@ /obj/item/weapon/implant/exile name = "exile implant" desc = "Prevents you from returning from away missions" + activated = 0 /obj/item/weapon/implant/exile/get_data() var/dat = {"Implant Specifications:
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index d35ab672b6a..ed3d7413b2e 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -5,6 +5,7 @@ icon_state = "off" density = 1 anchored = 1 + unacidable = 1 var/active = 0 diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 427f1bdad59..f1550350f74 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -1,249 +1,322 @@ -dmm_suite{ - load_map(var/dmm_file as file, var/z_offset as num){ - if(!z_offset){ - z_offset = world.maxz+1 - } - var/quote = ascii2text(34) - var/tfile = file2text(dmm_file) - var/tfile_len = length(tfile) - var/list/grid_models[0] - var/key_len = length(copytext(tfile,2,findtext(tfile,quote,2,0))) - for(var/lpos=1;lpos
Body
" - dat += "Random Body" + dat += "Random Body " + dat += "Always Random Body: [be_random_body ? "Yes" : "No"]
" dat += "
| "
@@ -174,6 +177,7 @@ datum/preferences
dat += "Blood Type: [blood_type] " dat += "Skin Tone: [skin_tone] " dat += "Underwear: [underwear] " + dat += "Undershirt: [undershirt] " dat += "Backpack: [backbaglist[backbag]] " @@ -268,7 +272,7 @@ datum/preferences dat += "" //user << browse(dat, "window=preferences;size=560x560") - var/datum/browser/popup = new(user, "preferences", " Character Setup ", 580, 600)
+ var/datum/browser/popup = new(user, "preferences", "Character Setup ", 580, 620)
popup.set_content(dat)
popup.open(0)
@@ -531,7 +535,10 @@ datum/preferences
ResetJobs()
SetChoices(user)
if("random")
- userandomjob = !userandomjob
+ if(jobban_isbanned(user, "Assistant"))
+ userandomjob = 1
+ else
+ userandomjob = !userandomjob
SetChoices(user)
if("setJobLevel")
UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
@@ -556,6 +563,8 @@ datum/preferences
facial_hair_style = random_facial_hair_style(gender)
if("underwear")
underwear = random_underwear(gender)
+ if("undershirt")
+ undershirt = random_undershirt(gender)
if("eyes")
eye_color = random_eye_color()
if("s_tone")
@@ -651,6 +660,15 @@ datum/preferences
if(new_underwear)
underwear = new_underwear
+ if("undershirt")
+ var/new_undershirt
+ if(gender == MALE)
+ new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_m
+ else
+ new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in undershirt_f
+ if(new_undershirt)
+ undershirt = new_undershirt
+
if("eyes")
var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference") as color|null
if(new_eyes)
@@ -705,6 +723,7 @@ datum/preferences
else
gender = MALE
underwear = random_underwear(gender)
+ undershirt = random_undershirt(gender)
facial_hair_style = random_facial_hair_style(gender)
hair_style = random_hair_style(gender)
@@ -727,6 +746,9 @@ datum/preferences
if("name")
be_random_name = !be_random_name
+ if("all")
+ be_random_body = !be_random_body
+
if("hear_midis")
toggles ^= SOUND_MIDI
@@ -774,6 +796,9 @@ datum/preferences
if(be_random_name)
real_name = random_name(gender)
+ if(be_random_body)
+ random_character(gender)
+
if(config.humans_need_surnames)
var/firstspace = findtext(real_name, " ")
var/name_length = length(real_name)
@@ -806,6 +831,7 @@ datum/preferences
character.hair_style = hair_style
character.facial_hair_style = facial_hair_style
character.underwear = underwear
+ character.undershirt = undershirt
if(backbag > 3 || backbag < 1)
backbag = 1 //Same as above
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 22e287c024f..74562dc81e5 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -169,6 +169,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["OOC_Notes"] >> metadata
S["real_name"] >> real_name
S["name_is_always_random"] >> be_random_name
+ S["body_is_always_random"] >> be_random_body
S["gender"] >> gender
S["age"] >> age
S["hair_color"] >> hair_color
@@ -178,6 +179,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["hair_style_name"] >> hair_style
S["facial_style_name"] >> facial_hair_style
S["underwear"] >> underwear
+ S["undershirt"] >> undershirt
S["backbag"] >> backbag
S["mutant_color"] >> mutant_color
@@ -204,15 +206,19 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
mutant_color = "#FFF"
if(!real_name) real_name = random_name(gender)
be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
+ be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
gender = sanitize_gender(gender)
if(gender == MALE)
hair_style = sanitize_inlist(hair_style, hair_styles_male_list)
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list)
underwear = sanitize_inlist(underwear, underwear_m)
+ undershirt = sanitize_inlist(undershirt, undershirt_m)
else
hair_style = sanitize_inlist(hair_style, hair_styles_female_list)
facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list)
underwear = sanitize_inlist(underwear, underwear_f)
+ undershirt = sanitize_inlist(undershirt, undershirt_f)
+
age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
hair_color = sanitize_hexcolor(hair_color, 3, 0)
facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0)
@@ -246,6 +252,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["OOC_Notes"] << metadata
S["real_name"] << real_name
S["name_is_always_random"] << be_random_name
+ S["body_is_always_random"] << be_random_body
S["gender"] << gender
S["age"] << age
S["hair_color"] << hair_color
@@ -255,6 +262,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["hair_style_name"] << hair_style
S["facial_style_name"] << facial_hair_style
S["underwear"] << underwear
+ S["undershirt"] << undershirt
S["backbag"] << backbag
S["species"] << pref_species.name
S["mutant_color"] << mutant_color
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 125810b6eb5..3de1b0b4916 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -3,8 +3,8 @@
var/flash_protect = 0 //Malk: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/tint = 0 //Malk: Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 // but seperated to allow items to protect but not impair vision, like space helmets
- var/visor_flags = null
- var/visor_flags_inv = null
+ var/visor_flags = 0 // flags that are added/removed when an item is adjusted up/down
+ var/visor_flags_inv = 0 // same as visor_flags, but for flags_inv
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
@@ -86,12 +86,38 @@ BLIND // can't see anything
var/alloweat = 0
strip_delay = 40
put_on_delay = 40
-
+ var/mask_adjusted = 0
+ var/ignore_maskadjust = 1
//Override this to modify speech like luchador masks.
/obj/item/clothing/mask/proc/speechModification(message)
return message
+//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
+/obj/item/clothing/mask/proc/adjustmask()
+ if(!ignore_maskadjust)
+ if(!usr.canmove || usr.stat || usr.restrained())
+ return
+ if(src.mask_adjusted == 1)
+ src.icon_state = initial(icon_state)
+ gas_transfer_coefficient = initial(gas_transfer_coefficient)
+ permeability_coefficient = initial(permeability_coefficient)
+ flags |= visor_flags
+ flags_inv |= visor_flags_inv
+ usr << "You push \the [src] back into place."
+ src.mask_adjusted = 0
+ else
+ src.icon_state += "_up"
+ usr << "You push \the [src] out of the way."
+ gas_transfer_coefficient = null
+ permeability_coefficient = null
+ flags &= ~visor_flags
+ flags_inv &= ~visor_flags_inv
+ src.mask_adjusted = 1
+ usr.update_inv_wear_mask()
+
+
+
//Shoes
/obj/item/clothing/shoes
name = "shoes"
@@ -228,20 +254,22 @@ BLIND // can't see anything
if(hastie)
user << "\A [hastie] is attached to it."
-atom/proc/generate_uniform(index,t_color)
- var/icon/female_uniform_icon = icon("icon"='icons/mob/uniform.dmi', "icon_state"="[t_color]_s")
+atom/proc/generate_female_clothing(index,t_color,icon)
+ var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"="[t_color]_s")
var/icon/female_s = icon("icon"='icons/mob/uniform.dmi', "icon_state"="female_s")
- female_uniform_icon.Blend(female_s, ICON_MULTIPLY)
- female_uniform_icon = fcopy_rsc(female_uniform_icon)
- female_uniform_icons[index] = female_uniform_icon
+ female_clothing_icon.Blend(female_s, ICON_MULTIPLY)
+ female_clothing_icon = fcopy_rsc(female_clothing_icon)
+ female_clothing_icons[index] = female_clothing_icon
/obj/item/clothing/under/verb/toggle()
set name = "Toggle Suit Sensors"
set category = "Object"
set src in usr
var/mob/M = usr
- if (istype(M, /mob/dead/)) return
- if (usr.stat) return
+ if (istype(M, /mob/dead/))
+ return
+ if (!can_use(usr))
+ return
if(src.has_sensor >= 2)
usr << "The controls are locked."
return 0
@@ -266,7 +294,7 @@ atom/proc/generate_uniform(index,t_color)
set name = "Adjust Jumpsuit Style"
set category = "Object"
set src in usr
- if(usr.stat)
+ if(!can_use(usr))
return
if(!can_adjust)
usr << "You cannot wear this suit any differently."
@@ -287,8 +315,10 @@ atom/proc/generate_uniform(index,t_color)
set name = "Remove Accessory"
set category = "Object"
set src in usr
- if(!istype(usr, /mob/living)) return
- if(usr.stat) return
+ if(!istype(usr, /mob/living))
+ return
+ if(!can_use(usr))
+ return
if(hastie)
hastie.transform *= 2
@@ -310,7 +340,7 @@ atom/proc/generate_uniform(index,t_color)
..()
/obj/item/clothing/proc/weldingvisortoggle() //Malk: proc to toggle welding visors on helmets, masks, goggles, etc.
- if(usr.canmove && !usr.stat && !usr.restrained())
+ if(can_use(usr))
if(up)
up = !up
flags |= (visor_flags)
@@ -333,4 +363,10 @@ atom/proc/generate_uniform(index,t_color)
if(istype(src, /obj/item/clothing/glasses))
usr.update_inv_glasses(0)
if(istype(src, /obj/item/clothing/mask))
- usr.update_inv_wear_mask(0)
\ No newline at end of file
+ usr.update_inv_wear_mask(0)
+
+/obj/item/clothing/proc/can_use(mob/user)
+ if(user && ismob(user))
+ if(!user.stat && user.canmove && !user.restrained())
+ return 1
+ return 0
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 5911f0178d8..054c7d2acab 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -147,10 +147,4 @@
name = "Optical Thermal Eyepatch"
desc = "An eyepatch with built-in thermal optics"
icon_state = "eyepatch"
- item_state = "eyepatch"
-
-/obj/item/clothing/glasses/thermal/jensen
- name = "Optical Thermal Implants"
- desc = "A set of implantable lenses designed to augment your vision"
- icon_state = "thermalimplants"
- item_state = "syringe_kit"
\ No newline at end of file
+ item_state = "eyepatch"
\ No newline at end of file
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 505c336b6aa..25e6b20f94a 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -68,13 +68,5 @@
emagged = 1
desc = desc + " The display flickers slightly."
-/obj/item/clothing/glasses/hud/security/jensenshades
- name = "Augmented shades"
- desc = "Polarized bioneural eyewear, designed to augment your vision."
- icon_state = "jensenshades"
- item_state = "jensenshades"
- vision_flags = SEE_MOBS
- invis_view = 2
-
/obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
process_data_hud(M,DATA_HUD_SECURITY,DATA_HUD_ADVANCED)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 360e6e52e63..88db2bd9160 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -21,6 +21,26 @@
armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
strip_delay = 80
+ action_button_name = "Toggle Helmet Visor"
+ visor_flags = HEADCOVERSEYES | HEADCOVERSMOUTH
+ visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE
+
+/obj/item/clothing/head/helmet/riot/attack_self()
+ if(usr.canmove && !usr.stat && !usr.restrained())
+ if(up)
+ up = !up
+ flags |= (visor_flags)
+ flags_inv |= (visor_flags_inv)
+ icon_state = initial(icon_state)
+ usr << "You pull the [src] down."
+ usr.update_inv_head(0)
+ else
+ up = !up
+ flags &= ~(visor_flags)
+ flags_inv &= ~(visor_flags_inv)
+ icon_state = "[initial(icon_state)]up"
+ usr << "You push the [src] up."
+ usr.update_inv_head(0)
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 64a9336b2ca..bfa388ae031 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -63,23 +63,21 @@
//Security
/obj/item/clothing/head/HoS
- name = "head of security hat"
- desc = "The robust hat of the Head of Security. For showing the officers who's in charge."
+ name = "head of security cap"
+ desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
icon_state = "hoscap"
armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
flags = 0
flags_inv = HIDEEARS
strip_delay = 80
-/obj/item/clothing/head/HoS/dermal
- name = "Dermal Armor Patch"
- desc = "An armored implant that automatically integrates just below the scalp for robust protection without sacrificing style."
- icon_state = "dermal"
- item_state = "dermal"
- flags_inv = 0
+/obj/item/clothing/head/HoS/drill
+ name = "head of security drill hat"
+ desc = "A robust drill hat for the Head of Security. For keeping the officers in line."
+ icon_state = "hosdrill"
/obj/item/clothing/head/warden
- name = "warden's hat"
+ name = "warden's police hat"
desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
icon_state = "policehelm"
armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 84f1d7ca791..132d31c2cc0 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -56,14 +56,6 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
-/obj/item/clothing/head/cueball
- name = "cueball helmet"
- desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
- icon_state = "cueball"
- flags = HEADCOVERSEYES|BLOCKHAIR
- item_state="cueball"
- flags_inv = 0
-
/obj/item/clothing/head/that
name = "sturdy top-hat"
desc = "It's an amish looking armored top hat."
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 13980d915db..78f76f8d971 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,7 +5,13 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
+ visor_flags_inv = HIDEFACE
w_class = 2
+ action_button_name = "Adjust Balaclava"
+ ignore_maskadjust = 0
+
+/obj/item/clothing/mask/balaclava/attack_self()
+ adjustmask()
/obj/item/clothing/mask/luchador
name = "Luchador Mask"
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index c500287c103..739dc16581a 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -5,9 +5,15 @@
item_state = "m_mask"
body_parts_covered = 0
flags = MASKCOVERSMOUTH | MASKINTERNALS
+ visor_flags = MASKCOVERSMOUTH | MASKINTERNALS
w_class = 2
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
+ action_button_name = "Adjust Breath Mask"
+ ignore_maskadjust = 0
+
+/obj/item/clothing/mask/breath/attack_self()
+ adjustmask()
/obj/item/clothing/mask/breath/medical
desc = "A close-fitting sterile mask that can be connected to an air supply."
@@ -15,4 +21,4 @@
icon_state = "medical"
item_state = "m_mask"
permeability_coefficient = 0.01
- put_on_delay = 10
+ put_on_delay = 10
\ No newline at end of file
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index de6247041be..295298df882 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -36,6 +36,7 @@
weldingvisortoggle()
+
// ********************************************************************
// **** Security gas mask ****
@@ -86,8 +87,10 @@
set category = "Object"
set name = "HALT"
set src in usr
- if(!istype(usr, /mob/living)) return
- if(usr.stat) return
+ if(!istype(usr, /mob/living))
+ return
+ if(!can_use(usr))
+ return
var/phrase = 0 //selects which phrase to use
var/phrase_text = null
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index d3e65f97a5f..59acfbd631d 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -23,9 +23,17 @@
item_state = "sterile"
w_class = 1
flags = MASKCOVERSMOUTH
+ flags_inv = HIDEFACE
+ visor_flags = MASKCOVERSMOUTH
+ visor_flags_inv = HIDEFACE
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
+ action_button_name = "Adjust Sterile Mask"
+ ignore_maskadjust = 0
+
+/obj/item/clothing/mask/surgical/attack_self()
+ adjustmask()
/obj/item/clothing/mask/fakemoustache
name = "fake moustache"
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
new file mode 100644
index 00000000000..6c1999ac6e1
--- /dev/null
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -0,0 +1,61 @@
+//banana flavored chaos and horror ahead
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes
+ name = "mk-honk prototype shoes"
+ desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
+ icon_state = "clown_prototype_off"
+ var/on = 0
+ var/bananium = 0
+ action_button_name = "Toggle Shoes"
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
+ if(on)
+ if(footstep > 1)//honks when activated
+ playsound(src, "sound/items/bikehorn.ogg", 75, 1)
+ footstep = 0
+ else
+ footstep++
+
+ new/obj/item/weapon/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180)), 5) //honk
+ bananium -= 100
+ if(bananium < 100)
+ on = !on
+ update_icon()
+ usr << "You ran out of bananium!"
+ else
+ ..()
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
+ if(bananium > 0)
+ var/sheet_amount = round(bananium / 2000)
+ if(sheet_amount > 0)
+ var/obj/item/stack/sheet/mineral/bananium/M = new/obj/item/stack/sheet/mineral/bananium(get_turf(loc))
+ M.amount = sheet_amount
+ bananium -= sheet_amount * 2000
+ user << "You retrieve [sheet_amount] sheets of bananium."
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/attackby(obj/item/O, mob/user)
+ if(istype(O,/obj/item/stack/sheet/mineral/bananium))
+ var/obj/item/stack/sheet/mineral/bananium/M = O
+ bananium += 2000 * M.amount
+ user << "You insert [M.amount] bananium sheets into the prototype shoes."
+ M.use(M.amount)
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
+ ..()
+ user << "The shoes are [on ? "enabled" : "disabled"]. There is [bananium] bananium left."
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click()
+ if(bananium > 0)
+ on = !on
+ update_icon()
+ usr << "You [on ? "activate" : "deactivate"] the prototype shoes."
+ else
+ usr << "You need bananium to turn the prototype shoes on."
+
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon()
+ if(on)
+ icon_state = "clown_prototype_on"
+ else
+ icon_state = "clown_prototype_off"
+ usr.update_inv_shoes()
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index efe04465a36..d7d2414ff68 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -14,6 +14,8 @@
set name = "Toggle Magboots"
set category = "Object"
set src in usr
+ if(!can_use(usr))
+ return
attack_self(usr)
@@ -49,4 +51,4 @@
desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
name = "blood-red magboots"
icon_state = "syndiemag0"
- magboot_state = "syndiemag"
+ magboot_state = "syndiemag"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 8c16e3d746d..bdf0b2ed3ba 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -1,3 +1,5 @@
+/obj/item/clothing/shoes/proc/step_action() //this was made to rewrite clown shoes squeaking
+
/obj/item/clothing/shoes/syndigaloshes
desc = "A pair of brown shoes. They seem to have extra grip."
name = "brown shoes"
@@ -50,6 +52,7 @@
icon_state = "wizard"
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic black shoes."
@@ -75,6 +78,13 @@
item_color = "clown"
var/footstep = 1 //used for squeeks whilst walking
+/obj/item/clothing/shoes/clown_shoes/step_action()
+ if(footstep > 1)
+ playsound(src, "clownstep", 50, 1)
+ footstep = 0
+ else
+ footstep++
+
/obj/item/clothing/shoes/jackboots
name = "jackboots"
desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index fcb6f1ca7ca..f3fc2721928 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -90,16 +90,17 @@
//Mining hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/mining
name = "mining hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
+ desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters."
icon_state = "hardsuit0-mining"
item_state = "mining_helm"
item_color = "mining"
+ flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE
armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
/obj/item/clothing/suit/space/hardsuit/mining
icon_state = "hardsuit-mining"
name = "mining hardsuit"
- desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
+ desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters."
item_state = "mining_hardsuit"
armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe)
@@ -137,6 +138,7 @@
armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50)
heat_protection = HEAD //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+ unacidable = 1
/obj/item/clothing/suit/space/hardsuit/wizard
icon_state = "hardsuit-wiz"
@@ -150,6 +152,7 @@
allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ unacidable = 1
//Medical hardsuit
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 3e33b19cd4a..32d90013168 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -17,8 +17,8 @@
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/armor/hos
- name = "armored coat"
- desc = "A greatcoat enchanced with a special alloy for some protection and style."
+ name = "armored greatcoat"
+ desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence."
icon_state = "hos"
item_state = "hos"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
@@ -29,6 +29,15 @@
strip_delay = 80
put_on_delay = 40
+/obj/item/clothing/suit/armor/hos/trenchcoat
+ name = "armored trenchoat"
+ desc = "A trenchcoat enchanced with a special lightweight kevlar. The epitome of tactical plainclothes."
+ icon_state = "jensencoat"
+ item_state = "jensencoat"
+ flags_inv = 0
+ strip_delay = 80
+ put_on_delay = 40
+
/obj/item/clothing/suit/armor/vest/warden
name = "warden's jacket"
desc = "An armored jacket with silver rank pips and livery."
@@ -111,6 +120,7 @@
slowdown = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
action_button_name = "Toggle Armor"
+ unacidable = 1
/obj/item/clothing/suit/armor/reactive/IsShield()
if(active)
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index fbacb60a169..3fe024e44e8 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -20,7 +20,7 @@
item_state = "bio_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
+ allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen)
//Chaplain
/obj/item/clothing/suit/chaplain_hoodie
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index a5fbc8e3d6d..076dc6cc927 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -1,97 +1,61 @@
/obj/item/clothing/suit/labcoat
name = "labcoat"
desc = "A suit that protects against minor chemical spills."
- icon_state = "labcoat_open"
+ icon_state = "labcoat"
item_state = "labcoat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper,/obj/item/weapon/melee/telebaton)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
+ var/open = 0
- verb/toggle()
- set name = "Toggle Labcoat Buttons"
- set category = "Object"
- set src in usr
+/obj/item/clothing/suit/labcoat/verb/toggle()
+ set name = "Toggle Labcoat Buttons"
+ set category = "Object"
+ set src in usr
- if(!usr.canmove || usr.stat || usr.restrained())
- return 0
+ if(!can_use(usr))
+ return 0
- switch(icon_state) //n-nooooo
- if("labcoat_open")
- src.icon_state = "labcoat"
- usr << "You button up the labcoat."
- if("labcoat")
- src.icon_state = "labcoat_open"
- usr << "You unbutton the labcoat."
- if("labcoat_cmo_open")
- src.icon_state = "labcoat_cmo"
- usr << "You button up the labcoat."
- if("labcoat_cmo")
- src.icon_state = "labcoat_cmo_open"
- usr << "You unbutton the labcoat."
- if("labcoat_gen_open")
- src.icon_state = "labcoat_gen"
- usr << "You button up the labcoat."
- if("labcoat_gen")
- src.icon_state = "labcoat_gen_open"
- usr << "You unbutton the labcoat."
- if("labcoat_chem_open")
- src.icon_state = "labcoat_chem"
- usr << "You button up the labcoat."
- if("labcoat_chem")
- src.icon_state = "labcoat_chem_open"
- usr << "You unbutton the labcoat."
- if("labcoat_vir_open")
- src.icon_state = "labcoat_vir"
- usr << "You button up the labcoat."
- if("labcoat_vir")
- src.icon_state = "labcoat_vir_open"
- usr << "You unbutton the labcoat."
- if("labcoat_tox_open")
- src.icon_state = "labcoat_tox"
- usr << "You button up the labcoat."
- if("labcoat_tox")
- src.icon_state = "labcoat_tox_open"
- usr << "You unbutton the labcoat."
- if("labgreen_open")
- src.icon_state = "labgreen"
- usr << "You button up the labcoat."
- if("labgreen")
- src.icon_state = "labgreen_open"
- usr << "You unbutton the labcoat."
- else
- usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are."
- return
- usr.update_inv_wear_suit() //so our overlays update
+ open = !open
+ icon_state = "[initial(icon_state)][open ? "_open":""]"
+ usr << "You [open ? "unbutton":"button up"] the labcoat"
+ usr.update_inv_wear_suit()
/obj/item/clothing/suit/labcoat/cmo
name = "chief medical officer's labcoat"
desc = "Bluer than the standard model."
- icon_state = "labcoat_cmo_open"
+ icon_state = "labcoat_cmo"
+ item_state = "labcoat_cmo"
+
+/obj/item/clothing/suit/labcoat/emt
+ name = "EMT's jacket"
+ desc = "A dark blue jacket with reflective strips for emergency medical technicians."
+ icon_state = "labcoat_emt"
item_state = "labcoat_cmo"
/obj/item/clothing/suit/labcoat/mad
name = "\improper The Mad's labcoat"
desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
- icon_state = "labgreen_open"
+ icon_state = "labgreen"
item_state = "labgreen"
/obj/item/clothing/suit/labcoat/genetics
name = "geneticist labcoat"
desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
- icon_state = "labcoat_gen_open"
+ icon_state = "labcoat_gen"
/obj/item/clothing/suit/labcoat/chemist
name = "chemist labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
- icon_state = "labcoat_chem_open"
+ icon_state = "labcoat_chem"
/obj/item/clothing/suit/labcoat/virologist
name = "virologist labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
- icon_state = "labcoat_vir_open"
+ icon_state = "labcoat_vir"
/obj/item/clothing/suit/labcoat/science
name = "scientist labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
- icon_state = "labcoat_tox_open"
+ icon_state = "labcoat_tox"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 76f209e90ce..b0ec44c0d58 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -210,13 +210,25 @@
icon_state = "nerdshirt"
item_state = "nerdshirt"
+/obj/item/clothing/suit/jacket
+ name = "bomber jacket"
+ desc = "Aviators not included."
+ icon_state = "bomberjacket"
+ item_state = "johnny"
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
+
+/obj/item/clothing/suit/jacket/leather
+ name = "leather jacket"
+ desc = "Pompadour not included."
+ icon_state = "leatherjacket"
+
//Blue suit jacket toggle
/obj/item/clothing/suit/suit/verb/toggle()
set name = "Toggle Jacket Buttons"
set category = "Object"
set src in usr
- if(!usr.canmove || usr.stat || usr.restrained())
+ if(!can_use(usr))
return 0
if(src.icon_state == "suitjacket_blue_open") //no god no
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 0dea814a1cc..df88c830561 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -7,12 +7,18 @@
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 20, rad = 20)
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user."
icon_state = "redwizard"
+/obj/item/clothing/head/wizard/yellow
+ name = "yellow wizard hat"
+ desc = "Strange-looking, yellow, hat-wear that most certainly belongs to a powerful magic user."
+ icon_state = "yellowwizard"
+
/obj/item/clothing/head/wizard/fake
name = "wizard hat"
desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
@@ -46,6 +52,7 @@
flags_inv = HIDEJUMPSUIT
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/suit/wizrobe/red
@@ -54,6 +61,11 @@
icon_state = "redwizard"
item_state = "redwizrobe"
+/obj/item/clothing/suit/wizrobe/yellow
+ name = "yellow wizard robe"
+ desc = "A magnificant, yellow, gem-lined robe that seems to radiate power."
+ icon_state = "yellowwizard"
+ item_state = "yellowwizrobe"
/obj/item/clothing/suit/wizrobe/marisa
name = "witch robe"
@@ -82,6 +94,7 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
@@ -90,6 +103,7 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
@@ -99,3 +113,4 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
\ No newline at end of file
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 41cd26d250e..2e331e46790 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,17 +1,27 @@
+/obj/item/clothing/under/color
+ desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
+
+/obj/item/clothing/under/color/random/New()
+ ..()
+ var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color)
+ var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - excluded)
+ name = initial(C.name)
+ icon_state = initial(C.icon_state)
+ item_state = initial(C.item_state)
+ item_color = initial(C.item_color)
+ suit_color = initial(C.item_color)
+
/obj/item/clothing/under/color/black
name = "black jumpsuit"
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
-/obj/item/clothing/under/color/blackf
- name = "feminine black jumpsuit"
- desc = "It's very smart and in a ladies-size!"
- icon_state = "black"
- item_state = "bl_suit"
- item_color = "blackf"
- fitted = 0
- can_adjust = 0
+/obj/item/clothing/under/color/grey
+ name = "grey jumpsuit"
+ icon_state = "grey"
+ item_state = "gy_suit"
+ item_color = "grey"
/obj/item/clothing/under/color/blue
name = "blue jumpsuit"
@@ -25,20 +35,12 @@
item_state = "g_suit"
item_color = "green"
-/obj/item/clothing/under/color/grey
- name = "grey jumpsuit"
- icon_state = "grey"
- item_state = "gy_suit"
- item_color = "grey"
-
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
- desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "Don't wear this near paranoid security officers."
icon_state = "orange"
item_state = "o_suit"
item_color = "orange"
- has_sensor = 2
- sensor_mode = 3
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
@@ -64,81 +66,78 @@
item_state = "y_suit"
item_color = "yellow"
-/obj/item/clothing/under/color/psyche
- name = "psychedelic jumpsuit"
- desc = "Groovy!"
- icon_state = "psyche"
- item_color = "psyche"
-
/obj/item/clothing/under/color/lightblue
name = "lightblue jumpsuit"
- desc = "lightblue"
icon_state = "lightblue"
+ item_state = "b_suit"
item_color = "lightblue"
/obj/item/clothing/under/color/aqua
name = "aqua jumpsuit"
- desc = "aqua"
icon_state = "aqua"
+ item_state = "b_suit"
item_color = "aqua"
/obj/item/clothing/under/color/purple
name = "purple jumpsuit"
- desc = "purple"
icon_state = "purple"
item_state = "p_suit"
item_color = "purple"
/obj/item/clothing/under/color/lightpurple
name = "lightpurple jumpsuit"
- desc = "lightpurple"
icon_state = "lightpurple"
+ item_state = "p_suit"
item_color = "lightpurple"
/obj/item/clothing/under/color/lightgreen
name = "lightgreen jumpsuit"
- desc = "lightgreen"
icon_state = "lightgreen"
+ item_state = "g_suit"
item_color = "lightgreen"
/obj/item/clothing/under/color/lightblue
name = "lightblue jumpsuit"
- desc = "lightblue"
icon_state = "lightblue"
+ item_state = "b_suit"
item_color = "lightblue"
/obj/item/clothing/under/color/lightbrown
name = "lightbrown jumpsuit"
- desc = "lightbrown"
icon_state = "lightbrown"
item_color = "lightbrown"
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
- desc = "brown"
icon_state = "brown"
item_color = "brown"
/obj/item/clothing/under/color/yellowgreen
name = "yellowgreen jumpsuit"
- desc = "yellowgreen"
icon_state = "yellowgreen"
+ item_state = "y_suit"
item_color = "yellowgreen"
/obj/item/clothing/under/color/darkblue
name = "darkblue jumpsuit"
- desc = "darkblue"
icon_state = "darkblue"
+ item_state = "b_suit"
item_color = "darkblue"
/obj/item/clothing/under/color/lightred
name = "lightred jumpsuit"
- desc = "lightred"
icon_state = "lightred"
+ item_state = "r_suit"
item_color = "lightred"
/obj/item/clothing/under/color/darkred
name = "darkred jumpsuit"
- desc = "darkred"
icon_state = "darkred"
- item_color = "darkred"
\ No newline at end of file
+ item_state = "r_suit"
+ item_color = "darkred"
+
+/obj/item/clothing/under/color/maroon
+ name = "maroon jumpsuit"
+ icon_state = "maroon"
+ item_state = "r_suit"
+ item_color = "maroon"
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index d56b94e60bb..351a97b5ee1 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -3,20 +3,29 @@
*/
/obj/item/clothing/under/rank/research_director
desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- name = "research director's suit"
+ name = "research director's vest suit"
icon_state = "director"
item_state = "g_suit"
item_color = "director"
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0)
can_adjust = 0
/obj/item/clothing/under/rank/research_director/alt
desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
- name = "research director's suit"
+ name = "research director's tan suit"
icon_state = "rdwhimsy"
item_state = "rdwhimsy"
item_color = "rdwhimsy"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
+ can_adjust = 1
+
+/obj/item/clothing/under/rank/research_director/turtleneck
+ desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
+ name = "research director's turtleneck"
+ icon_state = "rdturtle"
+ item_state = "p_suit"
+ item_color = "rdturtle"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
can_adjust = 1
/obj/item/clothing/under/rank/scientist
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index f7ada882d0a..658c78b3698 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -2,7 +2,6 @@
* Contains:
* Security
* Detective
- * Head of Security + Jensen cosplay gear
* Navy uniforms
*/
@@ -59,26 +58,6 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
strip_delay = 60
-/*
- * Jensen cosplay gear
- */
-/obj/item/clothing/under/rank/head_of_security/jensen
- desc = "You never asked for anything that stylish."
- name = "head of security's jumpsuit"
- icon_state = "jensen"
- item_state = "jensen"
- item_color = "jensen"
- can_adjust = 0
-
-/obj/item/clothing/suit/armor/hos/jensen
- name = "armored trenchoat"
- desc = "A trenchoat augmented with a special alloy for some protection and style"
- icon_state = "jensencoat"
- item_state = "jensencoat"
- flags_inv = 0
- strip_delay = 80
- put_on_delay = 40
-
/*
* Navy uniforms
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index cd904b67418..c46f5def722 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -14,14 +14,6 @@
item_state = "w_suit"
can_adjust = 0
-/obj/item/clothing/under/scratch
- name = "white suit"
- desc = "A white suit, suitable for an excellent host"
- icon_state = "scratch"
- item_state = "scratch"
- item_color = "scratch"
- can_adjust = 0
-
/obj/item/clothing/under/sl_suit
desc = "It's a very amish looking suit."
name = "amish suit"
@@ -46,6 +38,15 @@
item_color = "waiter"
can_adjust = 0
+/obj/item/clothing/under/rank/prisoner
+ name = "prison jumpsuit"
+ desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ icon_state = "prisoner"
+ item_state = "o_suit"
+ item_color = "prisoner"
+ has_sensor = 2
+ sensor_mode = 3
+
/obj/item/clothing/under/rank/mailman
name = "mailman's jumpsuit"
desc = "'Special delivery!'"
@@ -53,6 +54,13 @@
item_state = "b_suit"
item_color = "mailman"
+/obj/item/clothing/under/rank/psyche
+ name = "psychedelic jumpsuit"
+ desc = "Groovy!"
+ icon_state = "psyche"
+ item_state = "p_suit"
+ item_color = "psyche"
+
/obj/item/clothing/under/sexyclown
name = "sexy-clown suit"
desc = "It makes you look HONKable!"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 8ba79e8d250..0ad173c2391 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -15,5 +15,4 @@
desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
icon_state = "tactifool"
item_state = "bl_suit"
- item_color = "tactifool"
- can_adjust = 0
\ No newline at end of file
+ item_color = "tactifool"
\ No newline at end of file
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
new file mode 100644
index 00000000000..ba354b64915
--- /dev/null
+++ b/code/modules/crafting/guncrafting.dm
@@ -0,0 +1,83 @@
+// This file is for projectile weapon crafting. All parts and construction paths will be contained here.
+// The weapons themselves are children of other weapons and should be contained in their respective files.
+
+// PARTS //
+
+/obj/item/weaponcrafting/reciever
+ name = "modular reciever"
+ desc = "A prototype modular reciever and trigger assembly for a firearm."
+ icon = 'icons/obj/improvised.dmi'
+ icon_state = "reciever"
+
+/obj/item/weaponcrafting/stock
+ name = "rifle stock"
+ desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
+ icon = 'icons/obj/improvised.dmi'
+ icon_state = "riflestock"
+
+
+// CRAFTING //
+
+/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/pipe))
+ user << "You attach the shotgun barrel to the reciever. The pins seem loose."
+ var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
+ user.unEquip(src)
+ user.put_in_hands(I)
+ del(W)
+ del(src)
+ return
+
+// SHOTGUN //
+
+/obj/item/weaponcrafting/ishotgunconstruction
+ name = "slightly conspicuous metal construction"
+ desc = "A long pipe attached to a firearm reciever. The pins seem loose."
+ icon = 'icons/obj/improvised.dmi'
+ icon_state = "ishotgunstep1"
+
+/obj/item/weaponcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob)
+ ..()
+ if(istype(I, /obj/item/weapon/screwdriver))
+ var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2
+ user.unEquip(src)
+ user.put_in_hands(C)
+ user << "You screw the pins into place, securing the pipe to the reciever."
+ qdel(src)
+
+/obj/item/weaponcrafting/ishotgunconstruction2
+ name = "very conspicuous metal construction"
+ desc = "A long pipe attached to a trigger assembly."
+ icon = 'icons/obj/improvised.dmi'
+ icon_state = "ishotgunstep1"
+
+/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weaponcrafting/stock))
+ user << "You attach the stock to the reciever-barrel assembly."
+ var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
+ user.unEquip(src)
+ user.put_in_hands(I)
+ del(W)
+ del(src)
+ return
+
+/obj/item/weaponcrafting/ishotgunconstruction3
+ name = "extremely conspicuous metal construction"
+ desc = "A reciever-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose."
+ icon = 'icons/obj/improvised.dmi'
+ icon_state = "ishotgunstep2"
+
+/obj/item/weaponcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob)
+ ..()
+ if(istype(I, /obj/item/stack/packageWrap))
+ var/obj/item/stack/packageWrap/C = I
+ if (C.use(5))
+ var/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+ user.unEquip(src)
+ user.put_in_hands(W)
+ user << "You tie the wrapping paper around the stock and the barrel to secure it."
+ qdel(src)
+ else
+ user << "You need at least five feet of wrapping paper to secure the stock."
+ return
+
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
new file mode 100644
index 00000000000..6a53af52426
--- /dev/null
+++ b/code/modules/crafting/recipes.dm
@@ -0,0 +1,128 @@
+/datum/table_recipe
+ var/name = "" //in-game display name
+ var/reqs[] = list() //type paths of items consumed associated with how many are needed
+ var/result //type path of item resulting from this craft
+ var/tools[] = list() //type paths of items needed but not consumed
+ var/time = 0 //time in deciseconds
+ var/parts[] = list() //type paths of items that will be placed in the result
+ var/chem_catalists[] = list() //like tools but for reagents
+
+
+/datum/table_recipe/IED
+ name = "IED"
+ result = /obj/item/weapon/grenade/iedcasing
+ reqs = list(/datum/reagent/fuel = 50,
+ /obj/item/stack/cable_coil = 1,
+ /obj/item/device/assembly/igniter = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
+ parts = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
+ time = 80
+
+/datum/table_recipe/stunprod
+ name = "Stunprod"
+ result = /obj/item/weapon/melee/baton/cattleprod
+ reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
+ /obj/item/stack/rods = 1,
+ /obj/item/weapon/wirecutters = 1,
+ /obj/item/weapon/stock_parts/cell = 1)
+ time = 80
+ parts = list(/obj/item/weapon/stock_parts/cell = 1)
+
+/datum/table_recipe/ed209
+ name = "ED209"
+ result = /obj/machinery/bot/ed209
+ reqs = list(/obj/item/robot_parts/robot_suit = 1,
+ /obj/item/clothing/head/helmet = 1,
+ /obj/item/clothing/suit/armor/vest = 1,
+ /obj/item/robot_parts/l_leg = 1,
+ /obj/item/robot_parts/r_leg = 1,
+ /obj/item/stack/sheet/metal = 5,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/weapon/gun/energy/taser = 1,
+ /obj/item/weapon/stock_parts/cell = 1,
+ /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/robot_parts/r_arm = 1)
+ tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver)
+ time = 120
+
+/datum/table_recipe/secbot
+ name = "Secbot"
+ result = /obj/machinery/bot/secbot
+ reqs = list(/obj/item/device/assembly/signaler = 1,
+ /obj/item/clothing/head/helmet = 1,
+ /obj/item/weapon/melee/baton = 1,
+ /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/robot_parts/r_arm = 1)
+ tools = list(/obj/item/weapon/weldingtool)
+ time = 120
+
+/datum/table_recipe/cleanbot
+ name = "Cleanbot"
+ result = /obj/machinery/bot/cleanbot
+ reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1,
+ /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/robot_parts/r_arm = 1)
+ time = 80
+
+/datum/table_recipe/floorbot
+ name = "Floorbot"
+ result = /obj/machinery/bot/floorbot
+ reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1,
+ /obj/item/stack/tile/plasteel = 1,
+ /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/robot_parts/r_arm = 1)
+ time = 80
+
+/datum/table_recipe/medbot
+ name = "Medbot"
+ result = /obj/machinery/bot/medbot
+ reqs = list(/obj/item/device/healthanalyzer = 1,
+ /obj/item/weapon/storage/firstaid = 1,
+ /obj/item/device/assembly/prox_sensor = 1,
+ /obj/item/robot_parts/r_arm = 1)
+ time = 80
+
+/datum/table_recipe/flamethrower
+ name = "Flamethrower"
+ result = /obj/item/weapon/flamethrower
+ reqs = list(/obj/item/weapon/weldingtool = 1,
+ /obj/item/device/assembly/igniter = 1,
+ /obj/item/stack/rods = 2)
+ tools = list(/obj/item/weapon/screwdriver)
+ time = 20
+
+/datum/table_recipe/meteorshot
+ name = "Meteorshot Shell"
+ result = /obj/item/ammo_casing/shotgun/meteorshot
+ reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
+ /obj/item/weapon/rcd_ammo = 1,
+ /obj/item/weapon/stock_parts/manipulator = 2)
+ tools = list(/obj/item/weapon/screwdriver)
+ time = 5
+
+/datum/table_recipe/pulseslug
+ name = "Pulse Slug Shell"
+ result = /obj/item/ammo_casing/shotgun/pulseslug
+ reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
+ /obj/item/weapon/stock_parts/capacitor/adv = 2,
+ /obj/item/weapon/stock_parts/micro_laser/ultra = 1)
+ tools = list(/obj/item/weapon/screwdriver)
+ time = 5
+
+/datum/table_recipe/dragonsbreath
+ name = "Dragonsbreath Shell"
+ result = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+ reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
+ /datum/reagent/phosphorus = 5,)
+ tools = list(/obj/item/weapon/screwdriver)
+ time = 5
+
+/datum/table_recipe/ishotgun
+ name = "Improvised Shotgun"
+ result = /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+ reqs = list(/obj/item/weaponcrafting/reciever = 1,
+ /obj/item/pipe = 1,
+ /obj/item/weaponcrafting/stock = 1,
+ /obj/item/stack/packageWrap = 5,)
+ tools = list(/obj/item/weapon/screwdriver)
+ time = 200
\ No newline at end of file
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
new file mode 100644
index 00000000000..390765aa60c
--- /dev/null
+++ b/code/modules/crafting/table.dm
@@ -0,0 +1,166 @@
+/obj/structure/table
+ var/list/table_contents = list()
+
+/obj/structure/table/MouseDrop(atom/over)
+ if(over != usr)
+ return
+ interact(usr)
+
+/obj/structure/table/proc/check_contents(datum/table_recipe/R)
+ check_table()
+ main_loop:
+ for(var/A in R.reqs)
+ for(var/B in table_contents)
+ if(ispath(B, A))
+ if(table_contents[B] >= R.reqs[A])
+ continue main_loop
+ return 0
+ for(var/A in R.chem_catalists)
+ if(table_contents[A] < R.chem_catalists[A])
+ return 0
+ return 1
+
+/obj/structure/table/proc/check_table()
+ table_contents = list()
+ for(var/obj/item/I in loc)
+ if(istype(I, /obj/item/stack))
+ var/obj/item/stack/S = I
+ table_contents[I.type] += S.amount
+ else
+ if(istype(I, /obj/item/weapon/reagent_containers))
+ for(var/datum/reagent/R in I.reagents.reagent_list)
+ table_contents[R.type] += R.volume
+
+ table_contents[I.type] += 1
+
+/obj/structure/table/proc/check_tools(mob/user, datum/table_recipe/R)
+ if(!R.tools.len)
+ return 1
+ var/list/possible_tools = list()
+ for(var/obj/item/I in user.contents)
+ if(istype(I, /obj/item/weapon/storage))
+ for(var/obj/item/SI in I.contents)
+ possible_tools += SI.type
+ else
+ possible_tools += I.type
+ possible_tools += table_contents
+ var/i = R.tools.len
+ var/I
+ for(var/A in R.tools)
+ I = possible_tools.Find(A)
+ if(I)
+ possible_tools.Cut(I, I+1)
+ i--
+ else
+ break
+ return !i
+
+/obj/structure/table/proc/construct_item(mob/user, datum/table_recipe/R)
+ check_table()
+ if(check_contents(R) && check_tools(user, R))
+ if(do_after(user, R.time))
+ if(!check_contents(R) || !check_tools(user, R))
+ return 0
+ var/list/parts = del_reqs(R)
+ var/atom/movable/I = new R.result (loc)
+ for(var/A in parts)
+ if(istype(A, /obj/item))
+ var/atom/movable/B = A
+ B.loc = I
+ else
+ if(!I.reagents)
+ I.reagents = new /datum/reagents()
+ I.reagents.reagent_list.Add(A)
+ I.CheckParts()
+ return 1
+ return 0
+
+/obj/structure/table/proc/del_reqs(datum/table_recipe/R)
+ var/list/Deletion = list()
+ var/amt
+ for(var/A in R.reqs)
+ amt = R.reqs[A]
+ if(ispath(A, /obj/item/stack))
+ var/obj/item/stack/S
+ stack_loop:
+ for(var/B in table_contents)
+ if(ispath(B, A))
+ while(amt > 0)
+ S = locate(B) in loc
+ if(S.amount >= amt)
+ S.use(amt)
+ break stack_loop
+ else
+ amt -= S.amount
+ qdel(S)
+ else if(ispath(A, /obj/item))
+ var/obj/item/I
+ item_loop:
+ for(var/B in table_contents)
+ if(ispath(B, A))
+ while(amt > 0)
+ I = locate(B) in loc
+ Deletion.Add(I)
+ I.loc = null //remove it from the table loc so that we don't locate the same item every time (will be relocated inside the crafted item in construct_item())
+ amt--
+ break item_loop
+ else
+ var/datum/reagent/RG = new A
+ reagent_loop:
+ for(var/B in table_contents)
+ if(ispath(B, /obj/item/weapon/reagent_containers))
+ var/obj/item/RC = locate(B) in loc
+ if(RC.reagents.has_reagent(RG.id, amt))
+ RC.reagents.remove_reagent(RG.id, amt)
+ RG.volume = amt
+ Deletion.Add(RG)
+ break reagent_loop
+ else if(RC.reagents.has_reagent(RG.id))
+ Deletion.Add(RG)
+ RG.volume += RC.reagents.get_reagent_amount(RG.id)
+ amt -= RC.reagents.get_reagent_amount(RG.id)
+ RC.reagents.del_reagent(RG.id)
+
+ for(var/A in R.parts)
+ for(var/B in Deletion)
+ if(!istype(B, A))
+ Deletion.Remove(B)
+ qdel(B)
+
+ return Deletion
+
+/obj/structure/table/interact(mob/user)
+ if(user.stat || user.lying || !Adjacent(user))
+ return
+ check_table()
+ if(!table_contents.len)
+ return
+ user.face_atom(src)
+ var/dat = "Construction menu" + dat += ""
+ if(busy)
+ dat += "Construction in progress... "
+ else
+ for(var/datum/table_recipe/R in table_recipes)
+ if(check_contents(R))
+ dat += "[R.name]" + dat += "" + + var/datum/browser/popup = new(user, "table", "Table", 300, 300) + popup.set_content(dat) + popup.open() + return + +/obj/structure/table/Topic(href, href_list) + if(usr.stat || !Adjacent(usr) || usr.lying) + return + if(href_list["make"]) + var/datum/table_recipe/TR = locate(href_list["make"]) + busy = 1 + interact(usr) + if(construct_item(usr, TR)) + usr << "[TR.name] constructed." + else + usr << "Construction failed." + busy = 0 + interact(usr) \ No newline at end of file diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index 7781afff461..779a9800be2 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -43,7 +43,7 @@ if(ismob(target) && target.reagents && reagents.total_volume) user.visible_message("\The [target] has been smothered with \the [src] by \the [user]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise") src.reagents.reaction(target, TOUCH) - spawn(5) src.reagents.clear_reagents() + src.reagents.clear_reagents() return else ..() diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index 9062ed7e4a3..6ffb171e387 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -1,5 +1,5 @@ /datum/round_event_control/anomaly - name = "Energetic Flux" + name = "Anomaly: Energetic Flux" typepath = /datum/round_event/anomaly max_occurrences = 0 //This one probably shouldn't occur! It'd work, but it wouldn't be very fun. weight = 15 @@ -23,7 +23,7 @@ setup(safety_loop) /datum/round_event/anomaly/announce() - priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") + priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index 256a4322c81..5171ca6a4b6 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -1,5 +1,5 @@ /datum/round_event_control/anomaly/anomaly_bluespace - name = "Bluespace Anomaly" + name = "Anomaly: Bluespace" typepath = /datum/round_event/anomaly/anomaly_bluespace max_occurrences = 1 weight = 5 @@ -7,7 +7,7 @@ /datum/round_event/anomaly/anomaly_bluespace startWhen = 3 announceWhen = 10 - endWhen = 55 + endWhen = 95 /datum/round_event/anomaly/anomaly_bluespace/announce() @@ -21,7 +21,7 @@ /datum/round_event/anomaly/anomaly_bluespace/end() - if(newAnomaly)//If it hasn't been neutralized, it's time to warp half the station away jeez + if(newAnomaly.loc)//If it hasn't been neutralized, it's time to warp half the station away jeez var/turf/T = pick(get_area_turfs(impact_area)) if(T) // Calculate new position (searches through beacons in world) @@ -52,9 +52,7 @@ var/x_distance = TO.x - FROM.x for (var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid - if(A.anchored && istype(A, /obj/machinery)) continue - if(istype(A, /obj/structure/disposalpipe )) continue - if(istype(A, /obj/structure/cable )) continue + if(A.anchored) continue var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index dc7e9d4b219..fd4a10270b4 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -1,13 +1,13 @@ /datum/round_event_control/anomaly/anomaly_flux - name = "Energetic Flux" + name = "Anomaly: Hyper-Energetic Flux" typepath = /datum/round_event/anomaly/anomaly_flux - max_occurrences = 2 - weight = 15 + max_occurrences = 5 + weight = 20 /datum/round_event/anomaly/anomaly_flux startWhen = 3 announceWhen = 20 - endWhen = 60 + endWhen = 80 /datum/round_event/anomaly/anomaly_flux/announce() @@ -21,6 +21,6 @@ /datum/round_event/anomaly/anomaly_flux/end() - if(newAnomaly)//If it hasn't been neutralized, it's time to blow up. + if(newAnomaly.loc)//If it hasn't been neutralized, it's time to blow up. explosion(newAnomaly, -1, 3, 5, 5) qdel(newAnomaly) \ No newline at end of file diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm index 69d38c62231..4b44e18ba2a 100644 --- a/code/modules/events/anomaly_grav.dm +++ b/code/modules/events/anomaly_grav.dm @@ -1,13 +1,13 @@ /datum/round_event_control/anomaly/anomaly_grav - name = "Gravitational Anomaly" + name = "Anomaly: Gravitational" typepath = /datum/round_event/anomaly/anomaly_grav - max_occurrences = 2 - weight = 15 + max_occurrences = 5 + weight = 20 /datum/round_event/anomaly/anomaly_grav startWhen = 3 announceWhen = 20 - endWhen = 50 + endWhen = 120 /datum/round_event/anomaly/anomaly_grav/announce() diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index 49600a58136..237e59a1d48 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -1,17 +1,17 @@ /datum/round_event_control/anomaly/anomaly_pyro - name = "Pyroclastic Anomaly" + name = "Anomaly: Pyroclastic" typepath = /datum/round_event/anomaly/anomaly_pyro - max_occurrences = 2 - weight = 15 + max_occurrences = 5 + weight = 20 /datum/round_event/anomaly/anomaly_pyro startWhen = 10 announceWhen = 3 - endWhen = 70 + endWhen = 85 /datum/round_event/anomaly/anomaly_pyro/announce() - priority_announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + priority_announce("Pyroclastic anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") /datum/round_event/anomaly/anomaly_pyro/start() var/turf/T = pick(get_area_turfs(impact_area)) @@ -23,4 +23,14 @@ kill() return if(IsMultiple(activeFor, 5)) - newAnomaly.anomalyEffect() \ No newline at end of file + newAnomaly.anomalyEffect() + + +/datum/round_event/anomaly/anomaly_pyro/end() + if(newAnomaly.loc) + explosion(get_turf(newAnomaly), -1,0,3, flame_range = 4) + + var/mob/living/carbon/slime/S = new/mob/living/carbon/slime(get_turf(newAnomaly)) + S.colour = pick("red", "orange") + + qdel(newAnomaly) \ No newline at end of file diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm index 993bec48862..aed3d4a1320 100644 --- a/code/modules/events/anomaly_vortex.dm +++ b/code/modules/events/anomaly_vortex.dm @@ -1,13 +1,13 @@ /datum/round_event_control/anomaly/anomaly_vortex - name = "Vortex Anomaly" + name = "Anomaly: Vortex" typepath = /datum/round_event/anomaly/anomaly_vortex - max_occurrences = 5 - weight = 2 + max_occurrences = 2 + weight = 5 /datum/round_event/anomaly/anomaly_vortex startWhen = 10 announceWhen = 3 - endWhen = 80 + endWhen = 95 /datum/round_event/anomaly/anomaly_vortex/announce() diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 72cea9209af..0b65480c830 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -22,4 +22,6 @@ if(prob(95)) new /mob/living/simple_animal/hostile/carp(C.loc) else - new /mob/living/simple_animal/hostile/carp/megacarp(C.loc) \ No newline at end of file + new /mob/living/simple_animal/hostile/carp/megacarp(C.loc) + + diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 49deb57c137..a1280433c61 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -9,7 +9,7 @@ endWhen = 1 /datum/round_event/falsealarm/announce() - var/list/events_list + var/list/events_list = list() for(var/datum/round_event_control/E in events.control) if(!E.holidayID) //No holiday cheer allowed during non-holidays. Not even fake holiday cheer. events_list += E //No holiday cheer allowed during non-holidays. Not even fake holiday cheer. diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index ad6a82e04df..5e8996a8c1d 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -7,11 +7,78 @@ earliest_start = 0 /datum/round_event/spooky/start() + ..() for(var/mob/living/carbon/human/H in mob_list) + var/obj/item/weapon/storage/backpack/b = locate() in H.contents + new /obj/item/weapon/storage/spooky(b) if(H.dna) - hardset_dna(H, null, null, null, null, /datum/species/skeleton) + if(prob(50)) + hardset_dna(H, null, null, null, null, /datum/species/skeleton) + else + hardset_dna(H, null, null, null, null, /datum/species/zombie) + for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list) Ian.place_on_head(new /obj/item/weapon/bedsheet(Ian)) /datum/round_event/spooky/announce() priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE") + +//Eyeball migration +/datum/round_event_control/carp_migration/eyeballs + name = "Eyeball Migration" + typepath = /datum/round_event/carp_migration/eyeballs + holidayID = "Halloween" + weight = 25 + earliest_start = 0 + +/datum/round_event/carp_migration/eyeballs/start() + for(var/obj/effect/landmark/C in landmarks_list) + if(C.name == "carpspawn") + new /mob/living/simple_animal/hostile/carp/eyeball(C.loc) + +//Pumpking meteors waves +/datum/round_event_control/meteor_wave/spooky + name = "Pumpkin Wave" + typepath = /datum/round_event/meteor_wave/spooky + holidayID = "Halloween" + weight = 20 + max_occurrences = 2 + +/datum/round_event/meteor_wave/spooky + endWhen = 40 + +/datum/round_event/meteor_wave/spooky/tick() + if(IsMultiple(activeFor, 4)) + spawn_meteors(3, meteorsSPOOKY) //meteor list types defined in gamemode/meteor/meteors.dm + +//spooky foods (you can't actually make these when it's not halloween) +/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull + name = "skull cookie" + desc = "Spooky! It's got delicious calcium flavouring!" + icon = 'icons/obj/halloween_items.dmi' + icon_state = "skeletoncookie" + +/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin + name = "coffin cookie" + desc = "Spooky! It's got delicious coffee flavouring!" + icon = 'icons/obj/halloween_items.dmi' + icon_state = "coffincookie" + + +//spooky items + +/obj/item/weapon/storage/spooky + name = "trick-o-treat bag" + desc = "A Pumpkin shaped bag that holds all sorts of goodies!" + icon = 'icons/obj/halloween_items.dmi' + icon_state = "treatbag" + +/obj/item/weapon/storage/spooky/New() + ..() + for(var/distrobuteinbag=0 to 5) + var/type = pick(/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull, + /obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin, + /obj/item/weapon/reagent_containers/food/snacks/candy_corn, + /obj/item/weapon/reagent_containers/food/snacks/candy, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar) + new type(src) diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index aa1497767fa..4efc4c100ce 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -365,10 +365,7 @@ ________________________________________________________________________________ var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) equip_to_slot_or_del(R, slot_ears) - if(gender==FEMALE) - equip_to_slot_or_del(new /obj/item/clothing/under/color/blackf(src), slot_w_uniform) - else - equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform) + equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/space_ninja(src), slot_shoes) equip_to_slot_or_del(new /obj/item/clothing/suit/space/space_ninja(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves) @@ -384,6 +381,7 @@ ________________________________________________________________________________ var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(src) E.imp_in = src E.implanted = 1 + E.implanted(src) return 1 //=======//HELPER PROCS//=======// @@ -625,7 +623,7 @@ spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to var/mob/living/carbon/human/U = loc if(candrain&&!draining) var/turf/T = U.loc - if(isturf(T) && T.is_plating()) + if(isturf(T) && istype(T, /turf/simulated/floor/plating) attached = locate() in T if(!attached) U << "\red Warning: no exposed cable available." @@ -2209,9 +2207,8 @@ ________________________________________________________________________________ anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir) s_active=!s_active U.alpha = 0 - U << "You are now invisible to normal detection." - for(var/mob/O in oviewers(U)) - O.show_message("[U.name] vanishes into thin air!",1) + U.visible_message("[U.name] vanishes into thin air!", \ + "You are now invisible to normal detection.") return /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth() @@ -2221,9 +2218,8 @@ ________________________________________________________________________________ anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir) s_active=!s_active U.alpha = 255 - U << "You are now visible." - for(var/mob/O in oviewers(U)) - O.show_message("[U.name] appears from thin air!",1) + U.visible_message("[U.name] appears from thin air!", \ + "You are now visible.") return 1 return 0 @@ -2612,147 +2608,143 @@ It is possible to destroy the net by the occupant or someone else. var/mob/living/affecting = null//Who it is currently affecting, if anyone. var/mob/living/master = null//Who shot web. Will let this person know if the net was successful or failed. - proc - healthcheck() - if(health <=0) - density = 0 - if(affecting) - var/mob/living/carbon/M = affecting - M.anchored = 0 - for(var/mob/O in viewers(src, 3)) - O.show_message(text("[] was recovered from the energy net!", M.name), 1, text("You hear a grunt."), 2) - if(!isnull(master))//As long as they still exist. - master << "ERROR: \black unable to initiate transport protocol. Procedure terminated." - qdel(src) - return - - process(var/mob/living/carbon/M as mob) - var/check = 30//30 seconds before teleportation. Could be extended I guess. - var/mob_name = affecting.name//Since they will report as null if terminated before teleport. - //The person can still try and attack the net when inside. - while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed. - check-- - sleep(10) - - if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location. - if(!isnull(master))//As long as they still exist. - master << "ERROR: \black unable to locate \the [mob_name]. Procedure terminated." - qdel(src)//Get rid of the net. - return - - if(!isnull(src))//As long as both net and person exist. - //No need to check for countdown here since while() broke, it's implicit that it finished. - - density = 0//Make the net pass-through. - invisibility = 101//Make the net invisible so all the animations can play out. - health = INFINITY//Make the net invincible so that an explosion/something else won't kill it while, spawn() is running. - for(var/obj/item/W in M) - if(istype(M,/mob/living/carbon/human)) - if(W==M:w_uniform) continue//So all they're left with are shoes and uniform. - if(W==M:shoes) continue - M.unEquip(W) - - spawn(0) - playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1) - anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir) - - M.loc = pick(holdingfacility)//Throw mob in to the holding facility. - M << "You appear in a strange place!" - - spawn(0) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, M.loc) - spark_system.start() - playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1) - playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1) - anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir) - qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0). - +/obj/effect/energy_net/proc/healthcheck() + if(health <=0) + density = 0 + if(affecting) + var/mob/living/carbon/M = affecting + M.anchored = 0 for(var/mob/O in viewers(src, 3)) - O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) - + O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2) if(!isnull(master))//As long as they still exist. - master << "SUCCESS: \black transport procedure of \the [affecting] complete." + master << "ERROR: \black unable to initiate transport protocol. Procedure terminated." + qdel(src) + return - M.anchored = 0//Important. +/obj/effect/energy_net/process(var/mob/living/carbon/M as mob) + var/check = 30//30 seconds before teleportation. Could be extended I guess. + var/mob_name = affecting.name//Since they will report as null if terminated before teleport. + //The person can still try and attack the net when inside. + while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed. + check-- + sleep(10) - else//And they are free. - M << "You are free of the net!" + if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location. + if(!isnull(master))//As long as they still exist. + master << "ERROR: \black unable to locate \the [mob_name]. Procedure terminated." + qdel(src)//Get rid of the net. return - bullet_act(var/obj/item/projectile/Proj) - health -= Proj.damage - healthcheck() - ..() + if(!isnull(src))//As long as both net and person exist. + //No need to check for countdown here since while() broke, it's implicit that it finished. - ex_act(severity) - switch(severity) - if(1.0) - health-=50 - if(2.0) - health-=50 - if(3.0) - health-=prob(50)?50:25 - healthcheck() - return + density = 0//Make the net pass-through. + invisibility = 101//Make the net invisible so all the animations can play out. + health = INFINITY//Make the net invincible so that an explosion/something else won't kill it while, spawn() is running. + for(var/obj/item/W in M) + if(istype(M,/mob/living/carbon/human)) + if(W==M:w_uniform) continue//So all they're left with are shoes and uniform. + if(W==M:shoes) continue + M.unEquip(W) - blob_act() - health-=50 - healthcheck() - return + spawn(0) + playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1) + anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir) - hitby(AM as mob|obj) - ..() - for(var/mob/O in viewers(src, null)) - O.show_message(text("[src] was hit by [AM]."), 1) - var/tforce = 0 - if(ismob(AM)) - tforce = 10 - else - tforce = AM:throwforce - playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) - health = max(0, health - tforce) - healthcheck() - ..() - return + M.loc = pick(holdingfacility)//Throw mob in to the holding facility. + M << "You appear in a strange place!" - attack_hand() - if (HULK in usr.mutations) - usr << text("You easily destroy the energy net.") - for(var/mob/O in oviewers(src)) - O.show_message(text("[] rips the energy net apart!", usr), 1) + spawn(0) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() + spark_system.set_up(5, 0, M.loc) + spark_system.start() + playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1) + playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1) + anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir) + qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0). + + for(var/mob/O in viewers(src, 3)) + O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2) + + if(!isnull(master))//As long as they still exist. + master << "SUCCESS: \black transport procedure of \the [affecting] complete." + + M.anchored = 0//Important. + + else//And they are free. + M << "You are free of the net!" + return + +/obj/effect/energy_net/bullet_act(var/obj/item/projectile/Proj) + health -= Proj.damage + healthcheck() + ..() + +/obj/effect/energy_net/ex_act(severity) + switch(severity) + if(1.0) health-=50 - healthcheck() - return + if(2.0) + health-=50 + if(3.0) + health-=prob(50)?50:25 + healthcheck() + return - attack_paw() - return attack_hand() +/obj/effect/energy_net/blob_act() + health-=50 + healthcheck() + return - attack_alien() - if (islarva(usr)) - return - usr << text("\green You claw at the net.") - for(var/mob/O in oviewers(src)) - O.show_message(text("[] claws at the energy net!", usr), 1) - playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) - health -= rand(10, 20) - if(health <= 0) - usr << text("\green You slice the energy net to pieces.") - for(var/mob/O in oviewers(src)) - O.show_message(text("[] slices the energy net apart!", usr), 1) - healthcheck() - return +/obj/effect/energy_net/hitby(AM as mob|obj) + ..() + visible_message("[src] was hit by [AM].") + var/tforce = 0 + if(ismob(AM)) + tforce = 10 + else + tforce = AM:throwforce + playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) + health = max(0, health - tforce) + healthcheck() + ..() + return - attackby(obj/item/weapon/W as obj, mob/user as mob) - var/aforce = W.force - health = max(0, health - aforce) - healthcheck() - ..() +/obj/effect/energy_net/attack_hand(mob/user) + if (HULK in user.mutations) + user.visible_message("[user] rips the energy net apart!", \ + "You easily destroy the energy net.") + health-=50 + healthcheck() + return + +/obj/effect/energy_net/attack_paw(mob/user) + return attack_hand() + +/obj/effect/energy_net/attack_alien(mob/user as mob) + if (islarva(user)) return + playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) + health -= rand(10, 20) + if(health > 0) + user.visible_message("[user] claws at the energy net!", \ + "\green You claw at the net.") + else + user.visible_message("[user] slices the energy net apart!", \ + "\green You slice the energy net to pieces.") + healthcheck() + return + +/obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob) + var/aforce = W.force + health = max(0, health - aforce) + healthcheck() + ..() + return proc/create_ninja_mind(key) var/datum/mind/Mind = new /datum/mind(key) Mind.assigned_role = "MODE" Mind.special_role = "Space Ninja" ticker.mode.traitors |= Mind //Adds them to current traitor list. Which is really the extra antagonist list. - return Mind \ No newline at end of file + return Mind diff --git a/code/modules/events/wizard/fakeexplosion.dm b/code/modules/events/wizard/fakeexplosion.dm index 1424d63c18e..955fd7fd390 100644 --- a/code/modules/events/wizard/fakeexplosion.dm +++ b/code/modules/events/wizard/fakeexplosion.dm @@ -1,5 +1,5 @@ /datum/round_event_control/wizard/fake_explosion //Oh no the station is gone! - name = "Fake Explosion" + name = "Fake Nuclear Explosion" weight = 0 //Badmin exclusive now because once it's expected its not funny typepath = /datum/round_event/wizard/fake_explosion/ max_occurrences = 1 diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 3d8b0f4ddca..e28a1a7026f 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -7,7 +7,7 @@ /datum/round_event/wizard/greentext/start() - var/list/holder_canadates = player_list + var/list/holder_canadates = player_list.Copy() for(var/mob/M in holder_canadates) if(!ishuman(M)) holder_canadates -= M diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 6f6700f9624..312635711ff 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -247,9 +247,8 @@ proc/check_panel(mob/M) /obj/effect/fake_attacker/attackby(var/obj/item/weapon/P as obj, mob/user as mob) step_away(src,my_target,2) - for(var/mob/M in oviewers(world.view,my_target)) - M << "[my_target] flails around wildly." - my_target.show_message("[src] has been attacked by [my_target] ", 1) //Lazy. + my_target.visible_message("[my_target] flails around wildly.", \ + "[src] has been attacked by [my_target] ") src.health -= P.force @@ -261,7 +260,7 @@ proc/check_panel(mob/M) step_away(src,my_target,2) if(prob(30)) for(var/mob/O in oviewers(world.view , my_target)) - O << "[my_target] stumbles around." + O << "[my_target] stumbles around." /obj/effect/fake_attacker/New() ..() @@ -349,7 +348,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite /obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\ /obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\ /obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\ - /obj/item/clothing/shoes/magboots, /obj/item/blueprints, /obj/item/weapon/disk/nuclear,\ + /obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/weapon/disk/nuclear,\ /obj/item/clothing/suit/space/nasavoid, /obj/item/weapon/tank) /proc/fake_attack(var/mob/living/target) diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm index 21ec47ce544..7ef596d303a 100644 --- a/code/modules/food&drinks/food/condiment.dm +++ b/code/modules/food&drinks/food/condiment.dm @@ -6,7 +6,7 @@ //Food items that aren't eaten normally and leave an empty container behind. /obj/item/weapon/reagent_containers/food/condiment - name = "Condiment Container" + name = "condiment container" desc = "Just your average condiment container." icon = 'icons/obj/food.dmi' icon_state = "emptycondiment" @@ -14,7 +14,16 @@ possible_transfer_amounts = list(1,5,10) volume = 50 //Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites. - var/list/possible_states = list("ketchup" = list("ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "enzyme" = list("enzyme", "Universal Enzyme", "Used in cooking various dishes"), "soysauce" = list("soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("coldsauce", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("saltshaker", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("pepermillsmall", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("emptycondiment", "Sugar", "Tasty spacey sugar!")) + var/list/possible_states = list( + "ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."), + "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"), + "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"), + "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"), + "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"), + "sodiumchloride" = list("saltshaker", "salt shaker", "Salt. From space oceans, presumably"), + "blackpepper" = list("pepermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), + "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), + "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!")) /obj/item/weapon/reagent_containers/food/condiment/attackby(obj/item/weapon/W as obj, mob/user as mob) return @@ -41,10 +50,10 @@ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 - else if( istype(M, /mob/living/carbon/human) ) - visible_message("[user] attempts to feed [M] [src].") + else + user.visible_message("[user] attempts to feed [M] from [src].") if(!do_mob(user, M)) return - visible_message("[user] feeds [M] [src].") + user.visible_message("[user] feeds [M] from [src].") add_logs(user, M, "fed", object="[reagentlist(src)]") @@ -98,7 +107,7 @@ desc = temp_list[3] else - name = "misc Condiment Bottle" + name = "condiment bottle" main_reagent = reagents.get_master_reagent_name() if (reagents.reagent_list.len==1) desc = "Looks like it is [lowertext(main_reagent)], but you are not sure." @@ -107,12 +116,12 @@ icon_state = "mixedcondiments" else icon_state = "emptycondiment" - name = "condiment Bottle" + name = "condiment bottle" desc = "An empty condiment bottle." return /obj/item/weapon/reagent_containers/food/condiment/enzyme - name = "Universal Enzyme" + name = "universal enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" @@ -127,7 +136,7 @@ reagents.add_reagent("sugar", 50) /obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then - name = "Salt Shaker" // a large one. + name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" possible_transfer_amounts = list(1,20) //for clown turning the lid off @@ -139,7 +148,7 @@ reagents.add_reagent("sodiumchloride", 20) /obj/item/weapon/reagent_containers/food/condiment/peppermill - name = "Pepper Mill" + name = "pepper mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" possible_transfer_amounts = list(1,20) //for clown turning the lid off diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 07eb64cbe03..3cdea87cb8e 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -182,12 +182,12 @@ if(isanimal(M)) if(iscorgi(M)) if(bitecount == 0 || prob(50)) - M.emote("nibbles away at the [src]") + M.emote("me", 1, "nibbles away at the [src]") bitecount++ if(bitecount >= 5) var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was") if(sattisfaction_text) - M.emote("[sattisfaction_text]") + M.emote("me", 1, "[sattisfaction_text]") qdel(src) @@ -218,1020 +218,7 @@ // reagents.add_reagent("nutriment", 2) // this line of code for all the contents. // bitesize = 3 //This is the amount each bite consumes. - -////////////////////////////////////////////SALAD//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/aesirsalad - name = "\improper Aesir salad" - desc = "Probably too incredible for mortal men to fully enjoy." - icon_state = "aesirsalad" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New() - ..() - eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("tricordrazine", 8) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/herbsalad - name = "herb salad" - desc = "A tasty salad with apples on top." - icon_state = "herbsalad" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/validsalad - name = "valid salad" - desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." - icon_state = "validsalad" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/validsalad/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("doctorsdelight", 5) - bitesize = 3 - -////////////////////////////////////////////DONUTS//////////////////////////////////////////// - - -/obj/item/weapon/reagent_containers/food/snacks/donut - name = "donut" - icon_state = "donut1" - -/obj/item/weapon/reagent_containers/food/snacks/donut/normal - desc = "Goes great with Robust Coffee." - -/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - src.bitesize = 3 - if(prob(30)) - src.icon_state = "donut2" - src.name = "frosted donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/chaos - name = "chaos donut" - desc = "Like life, it never quite tastes the same." - -/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sprinkles", 1) - bitesize = 10 - switch(rand(1,10)) - if(1) - reagents.add_reagent("nutriment", 3) - if(2) - reagents.add_reagent("capsaicin", 3) - if(3) - reagents.add_reagent("frostoil", 3) - if(4) - reagents.add_reagent("sprinkles", 3) - if(5) - reagents.add_reagent("plasma", 3) - if(6) - reagents.add_reagent("coco", 3) - if(7) - reagents.add_reagent("slimejelly", 3) - if(8) - reagents.add_reagent("banana", 3) - if(9) - reagents.add_reagent("berryjuice", 3) - if(10) - reagents.add_reagent("tricordrazine", 3) - if(prob(30)) - icon_state = "donut2" - name = "frosted chaos donut" - reagents.add_reagent("sprinkles", 2) - - -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly - name = "jelly donut" - desc = "You jelly?" - icon_state = "jdonut1" - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) - if(prob(30)) - icon_state = "jdonut2" - name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly - name = "jelly donut" - desc = "You jelly?" - icon_state = "jdonut1" - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("slimejelly", 5) - bitesize = 5 - if(prob(30)) - icon_state = "jdonut2" - name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly - name = "jelly donut" - desc = "You jelly?" - icon_state = "jdonut1" - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("cherryjelly", 5) - if(prob(30)) - icon_state = "jdonut2" - name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -////////////////////////////////////////////WAFFLES//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/waffles - name = "waffles" - desc = "Mmm, waffles." - icon_state = "waffles" - trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/waffles/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/soylentgreen - name = "\improper Soylent Green" - desc = "Not made of people. Honest." //Totally people. - icon_state = "soylent_green" - trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New() - ..() - reagents.add_reagent("nutriment", 10) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/soylenviridians - name = "\improper Soylent Virdians" - desc = "Not made of people. Honest." //Actually honest for once. - icon_state = "soylent_yellow" - trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New() - ..() - reagents.add_reagent("nutriment", 10) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles - name = "roffle waffles" - desc = "Waffles from Roffle. Co." - icon_state = "rofflewaffles" - trash = /obj/item/trash/waffles - -/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("mushroomhallucinogen", 8) - bitesize = 4 - -////////////////////////////////////////////FISH//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/cubancarp - name = "\improper Cuban carp" - desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" - icon_state = "cubancarp" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("carpotoxin", 3) - reagents.add_reagent("capsaicin", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat - name = "carp fillet" - desc = "A fillet of spess carp meat." - icon_state = "fishfillet" - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New() - ..() - eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("carpotoxin", 3) - bitesize = 6 - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation - name = "imitation carp fillet" - desc = "Almost just like the real thing, kinda." - -/obj/item/weapon/reagent_containers/food/snacks/fishfingers - name = "fish fingers" - desc = "A finger of fish." - icon_state = "fishfingers" - -/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("carpotoxin", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/fishandchips - name = "fish and chips" - desc = "I do say so myself chap." - icon_state = "fishandchips" - -/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("carpotoxin", 3) - bitesize = 3 - -////////////////////////////////////////////EGGS//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg - name = "chocolate egg" - desc = "Such, sweet, fattening food." - icon_state = "chocolateegg" - -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/egg - name = "egg" - desc = "An egg!" - icon_state = "egg" - -/obj/item/weapon/reagent_containers/food/snacks/egg/New() - ..() - reagents.add_reagent("nutriment", 1) - -/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom) - ..() - new/obj/effect/decal/cleanable/egg_smudge(src.loc) - reagents.reaction(hit_atom, TOUCH) - del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes. - -/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype( W, /obj/item/toy/crayon )) - var/obj/item/toy/crayon/C = W - var/clr = C.colourName - - if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow"))) - usr << "[src] refuses to take on this colour!" - return - - usr << "You colour [src] [clr]." - icon_state = "egg-[clr]" - item_color = clr - else - ..() - -/obj/item/weapon/reagent_containers/food/snacks/egg/blue - icon_state = "egg-blue" - item_color = "blue" - -/obj/item/weapon/reagent_containers/food/snacks/egg/green - icon_state = "egg-green" - item_color = "green" - -/obj/item/weapon/reagent_containers/food/snacks/egg/mime - icon_state = "egg-mime" - item_color = "mime" - -/obj/item/weapon/reagent_containers/food/snacks/egg/orange - icon_state = "egg-orange" - item_color = "orange" - -/obj/item/weapon/reagent_containers/food/snacks/egg/purple - icon_state = "egg-purple" - item_color = "purple" - -/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow - icon_state = "egg-rainbow" - item_color = "rainbow" - -/obj/item/weapon/reagent_containers/food/snacks/egg/red - icon_state = "egg-red" - item_color = "red" - -/obj/item/weapon/reagent_containers/food/snacks/egg/yellow - icon_state = "egg-yellow" - item_color = "yellow" - -/obj/item/weapon/reagent_containers/food/snacks/friedegg - name = "fried egg" - desc = "A fried egg, with a touch of salt and pepper." - icon_state = "friedegg" - -/obj/item/weapon/reagent_containers/food/snacks/friedegg/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/boiledegg - name = "boiled egg" - desc = "A hard boiled egg." - icon_state = "egg" - -/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New() - ..() - reagents.add_reagent("nutriment", 2) - -/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS - name = "omelette du fromage" - desc = "That's all you can say!" - icon_state = "omelette" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/omelette/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user) - if(istype(W,/obj/item/weapon/kitchen/utensil/fork)) - if(W.icon_state == "forkloaded") - user << "You already have omelette on your fork." - return - W.icon_state = "forkloaded" - user.visible_message( \ - "[user] takes a piece of omelette with their fork!", \ - "You take a piece of omelette with your fork!" \ - ) - reagents.remove_reagent("nutriment", 1) - if(reagents.total_volume <= 0) - qdel(src) - -/obj/item/weapon/reagent_containers/food/snacks/benedict - name = "eggs benedict" - desc = "There is only one egg on this, how rude." - icon_state = "benedict" - -/obj/item/weapon/reagent_containers/food/snacks/benedict/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 3 - -////////////////////////////////////////////MUFFINS//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/muffin - name = "muffin" - desc = "A delicious and spongy little cake." - icon_state = "muffin" - -/obj/item/weapon/reagent_containers/food/snacks/muffin/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/muffin/berry - name = "berry muffin" - icon_state = "berrymuffin" - desc = "A delicious and spongy little cake, with berries." - -/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry - name = "booberry muffin" - icon_state = "berrymuffin" - alpha = 125 - desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" - -////////////////////////////////////////////OTHER//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/candy - name = "candy" - desc = "Nougat love it or hate it." - icon_state = "candy" - trash = /obj/item/trash/candy - -/obj/item/weapon/reagent_containers/food/snacks/candy/New() - ..() - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("sugar", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/candy_corn - name = "candy corn" - desc = "It's a handful of candy corn. Can be stored in a detective's hat." - icon_state = "candy_corn" - -/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sugar", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/chips - name = "chips" - desc = "Commander Riker's What-The-Crisps" - icon_state = "chips" - trash = /obj/item/trash/chips - -/obj/item/weapon/reagent_containers/food/snacks/chips/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/cookie - name = "cookie" - desc = "COOKIE!!!" - icon_state = "COOKIE!!!" - -/obj/item/weapon/reagent_containers/food/snacks/cookie/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar - name = "chocolate bar" - desc = "Such, sweet, fattening food." - icon_state = "chocolatebarunwrapped" - wrapped = 0 - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sugar", 2) - reagents.add_reagent("coco", 2) - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user) - if(wrapped) - Unwrap(user) - else - ..() - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user) - icon_state = "chocolatebarunwrapped" - desc = "It won't make you all sticky." - user << "You remove the foil." - wrapped = 0 - - -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/wrapped - desc = "It's wrapped in some foil." - icon_state = "chocolatebar" - wrapped = 1 - -/obj/item/weapon/reagent_containers/food/snacks/tofu - name = "tofu" - desc = "We all love tofu." - icon_state = "tofu" - -/obj/item/weapon/reagent_containers/food/snacks/tofu/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice - name = "huge mushroom slice" - desc = "A slice from a huge mushroom." - icon_state = "hugemushroomslice" - -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New() - ..() - reagents.add_reagent("nutriment", 3) - src.bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/tomatomeat - name = "tomato slice" - desc = "A slice from a huge tomato." - icon_state = "tomatomeat" - -/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New() - ..() - reagents.add_reagent("nutriment", 3) - src.bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/bearmeat - name = "bear meat" - desc = "A very manly slab of meat." - icon_state = "bearmeat" - -/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New() - ..() - reagents.add_reagent("nutriment", 12) - reagents.add_reagent("hyperzine", 5) - src.bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/xenomeat - name = "meat" - desc = "A slab of meat" - icon_state = "xenomeat" - -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New() - ..() - reagents.add_reagent("nutriment", 3) - src.bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/spidermeat - name = "spider meat" - desc = "A slab of spider meat." - icon_state = "spidermeat" - -/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("toxin", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/spiderleg - name = "spider leg" - desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" - icon_state = "spiderleg" - -/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("toxin", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/cornedbeef - name = "corned beef and cabbage" - desc = "Now you can feel like a real tourist vacationing in Ireland." - icon_state = "cornedbeef" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/faggot - name = "faggot" - desc = "A great meal all round. Not a cord of wood." - icon_state = "faggot" - -/obj/item/weapon/reagent_containers/food/snacks/faggot/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/sausage - name = "sausage" - desc = "A piece of mixed, long meat." - icon_state = "sausage" - -/obj/item/weapon/reagent_containers/food/snacks/sausage/New() - ..() - eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/donkpocket - name = "\improper Donk-pocket" - desc = "The food of choice for the seasoned traitor." - icon_state = "donkpocket" - var/warm = 0 - -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New() - ..() - reagents.add_reagent("nutriment", 4) - - - -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp? - if(warm) - spawn(4200) //ew - warm = 0 - reagents.del_reagent("tricordrazine") - name = initial(name) - return - -/obj/item/weapon/reagent_containers/food/snacks/wingfangchu - name = "wing fang chu" - desc = "A savory dish of alien wing wang in soy." - icon_state = "wingfangchu" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/human/kebab - name = "-kebab" - icon_state = "kebab" - desc = "A human meat, on a stick." - trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/monkeykebab - name = "meat-kebab" - icon_state = "kebab" - desc = "Delicious meat, on a stick." - trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/tofukebab - name = "tofu-kebab" - icon_state = "kebab" - desc = "Vegan meat, on a stick." - trash = /obj/item/stack/rods - -/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New() - ..() - reagents.add_reagent("nutriment", 8) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/popcorn - name = "popcorn" - desc = "Now let's find some cinema." - icon_state = "popcorn" - trash = /obj/item/trash/popcorn - var/unpopped = 0 - -/obj/item/weapon/reagent_containers/food/snacks/popcorn/New() - ..() - eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") - unpopped = rand(1,10) - reagents.add_reagent("nutriment", 2) - bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 - -/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume() - if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE - usr << "You bite down on an un-popped kernel, and it hurts your teeth!" - unpopped = max(0, unpopped-1) - reagents.add_reagent("sacid",0.1) //only a little tingle. - ..() - - -/obj/item/weapon/reagent_containers/food/snacks/sosjerky - name = "\improper Scaredy's Private Reserve Beef Jerky" - icon_state = "sosjerky" - desc = "Beef jerky made from the finest space cows." - trash = /obj/item/trash/sosjerky - -/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New() - ..() - reagents.add_reagent("nutriment", 4) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/no_raisin - name = "4no raisins" - icon_state = "4no_raisins" - desc = "Best raisins in the universe. Not sure why." - trash = /obj/item/trash/raisins - -/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New() - ..() - reagents.add_reagent("nutriment", 6) - -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie - name = "space twinkie" - icon_state = "space_twinkie" - desc = "Guaranteed to survive longer than you will." - -/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New() - ..() - reagents.add_reagent("sugar", 4) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers - name = "cheesie honkers" - desc = "Bite sized cheesie snacks that will honk all over your mouth." - icon_state = "cheesie_honkers" - trash = /obj/item/trash/cheesie - -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New() - ..() - reagents.add_reagent("nutriment", 4) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/syndicake - name = "syndi-cakes" - icon_state = "syndi_cakes" - desc = "An extremely moist snack cake that tastes just as good after being nuked." - trash = /obj/item/trash/syndi_cakes - -/obj/item/weapon/reagent_containers/food/snacks/syndicake/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("doctorsdelight", 5) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato - name = "loaded baked potato" - desc = "Totally baked." - icon_state = "loadedbakedpotato" - -/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/fries - name = "space fries" - desc = "AKA: French Fries, Freedom Fries, etc." - icon_state = "fries" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/fries/New() - ..() - reagents.add_reagent("nutriment", 4) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/soydope - name = "soy dope" - desc = "Dope from a soy." - icon_state = "soydope" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/soydope/New() - ..() - reagents.add_reagent("nutriment", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/cheesyfries - name = "cheesy fries" - desc = "Fries. Covered in cheese. Duh." - icon_state = "cheesyfries" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie - name = "fortune cookie" - desc = "A true prophecy in each cookie!" - icon_state = "fortune_cookie" - -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/badrecipe - name = "burned mess" - desc = "Someone should be demoted from chef for this." - icon_state = "badrecipe" - -/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New() - ..() - eatverb = pick("choke down","nibble","gnaw","chomp") - reagents.add_reagent("toxin", 1) - reagents.add_reagent("carbon", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/meatsteak - name = "meat steak" - desc = "A piece of hot spicy meat." - icon_state = "meatsteak" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New() - ..() - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff - name = "spacy liberty duff" - desc = "Jello gelatin, from Alfred Hubbard's cookbook." - icon_state = "spacylibertyduff" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("mushroomhallucinogen", 6) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/amanitajelly - name = "amanita jelly" - desc = "Looks curiously toxic." - icon_state = "amanitajelly" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("amatoxin", 6) - reagents.add_reagent("mushroomhallucinogen", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel - name = "poppy pretzel" - desc = "It's all twisted up!" - icon_state = "poppypretzel" - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 2 - -/* No more of this -/obj/item/weapon/reagent_containers/food/snacks/telebacon - name = "tele bacon" - desc = "It tastes a little odd but it is still delicious." - icon_state = "bacon" - var/obj/item/device/radio/beacon/bacon/baconbeacon - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/telebacon/New() - ..() - reagents.add_reagent("nutriment", 4) - baconbeacon = new /obj/item/device/radio/beacon/bacon(src) -/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume() - if(!reagents.total_volume) - baconbeacon.loc = usr - baconbeacon.digest_delay() -*/ - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube - name = "monkey cube" - desc = "Just add water!" - icon_state = "monkeycube" - bitesize = 12 - wrapped = 0 - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New() - ..() - reagents.add_reagent("nutriment",10) - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity) - if(!proximity) return - if(istype(O,/obj/structure/sink) && !wrapped) - user << "You place [src] under a stream of water..." - user.drop_item() - loc = get_turf(O) - return Expand() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user) - if(wrapped) - Unwrap(user) - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand() - visible_message("[src] expands!") - new /mob/living/carbon/monkey(get_turf(src)) - qdel(src) - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user) - icon_state = "monkeycube" - desc = "Just add water!" - user << "You unwrap the cube." - wrapped = 0 - - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped - desc = "Still wrapped in some paper." - icon_state = "monkeycubewrap" - wrapped = 1 - -/obj/item/weapon/reagent_containers/food/snacks/enchiladas - name = "enchiladas" - desc = "Viva La Mexico!" - icon_state = "enchiladas" - -/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New() - ..() - reagents.add_reagent("nutriment",8) - reagents.add_reagent("capsaicin", 6) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/stew - name = "stew" - desc = "A nice and warm stew. Healthy and strong." - icon_state = "stew" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/stew/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 5) - bitesize = 10 - -/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat - name = "stewed soy meat" - desc = "Even non-vegetarians will LOVE this!" - icon_state = "stewedsoymeat" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New() - ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - reagents.add_reagent("nutriment", 8) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/carrotfries - name = "carrot fries" - desc = "Tasty fries from fresh Carrots." - icon_state = "carrotfries" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("imidazoline", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/candiedapple - name = "candied apple" - desc = "An apple coated in sugary sweetness." - icon_state = "candiedapple" - -/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New() - ..() - reagents.add_reagent("nutriment", 3) - bitesize = 3 - -/* -/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore - name = "Boiled slime Core" - desc = "A boiled red thing." - icon_state = "boiledslimecore" - -/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New() - ..() - reagents.add_reagent("slimejelly", 5) - bitesize = 3 -*/ -/obj/item/weapon/reagent_containers/food/snacks/mint - name = "mint" - desc = "it is only wafer thin." - icon_state = "mint" - -/obj/item/weapon/reagent_containers/food/snacks/mint/New() - ..() - reagents.add_reagent("minttoxin", 1) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit - name = "plump helmet biscuit" - desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." - icon_state = "phelmbiscuit" - -/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New() - ..() - if(prob(10)) - name = "exceptional plump helmet biscuit" - desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("tricordrazine", 5) - bitesize = 2 - else - reagents.add_reagent("nutriment", 5) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/chawanmushi - name = "chawanmushi" - desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat." - icon_state = "chawanmushi" - trash = /obj/item/trash/snack_bowl - -/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/appletart - name = "golden apple streusel tart" - desc = "A tasty dessert that won't make it through a metal detector." - icon_state = "gappletart" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/appletart/New() - ..() - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("gold", 5) - bitesize = 3 +//All foods (except slicable, since they have unique procs) are distributed among various categories. Use common sense. /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels @@ -1278,115 +265,4 @@ name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/cracker - name = "cracker" - desc = "It's a salted cracker." - icon_state = "cracker" - -/obj/item/weapon/reagent_containers/food/snacks/cracker/New() - ..() - reagents.add_reagent("nutriment", 1) - - -////////////////////////////////FOOD ADDITIONS//////////////////////////////////////////// - -/obj/item/weapon/reagent_containers/food/snacks/wrap - name = "egg wrap" - desc = "The precursor to Pigs in a Blanket." - icon_state = "wrap" - -/obj/item/weapon/reagent_containers/food/snacks/wrap/New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/beans - name = "tin of beans" - desc = "Musical fruit in a slightly less musical container." - icon_state = "beans" - -/obj/item/weapon/reagent_containers/food/snacks/beans/New() - ..() - reagents.add_reagent("nutriment", 10) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/hotdog - name = "hotdog" - desc = "Fresh footlong ready to go down on." - icon_state = "hotdog" - -/obj/item/weapon/reagent_containers/food/snacks/hotdog/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("ketchup", 3) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/meatbun - name = "meat bun" - desc = "Has the potential to not be Dog." - icon_state = "meatbun" - -/obj/item/weapon/reagent_containers/food/snacks/meatbun/New() - ..() - reagents.add_reagent("nutriment", 6) - bitesize = 6 - -/obj/item/weapon/reagent_containers/food/snacks/sugarcookie - name = "sugar cookie" - desc = "Just like your little sister used to make." - icon_state = "sugarcookie" - -/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sugar", 5) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg - name = "boiled spider leg" - desc = "A giant spider's leg that's still twitching after being cooked. Gross!" - icon_state = "spiderlegcooked" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New() - ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("toxin", 2) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/spidereggs - name = "spider eggs" - desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health." - icon_state = "spidereggs" - -/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New() - ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("toxin", 3) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/spidereggsham - name = "green eggs and ham" - desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" - icon_state = "spidereggsham" - trash = /obj/item/trash/plate - -/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("toxin", 3) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/sashimi - name = "carp sashimi" - desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." - icon_state = "sashimi" - -/obj/item/weapon/reagent_containers/food/snacks/sashimi/New() - ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("toxin", 5) - bitesize = 3 + bitesize = 2 \ No newline at end of file diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm index 91b2c27b243..9397cd6b40f 100644 --- a/code/modules/food&drinks/food/snacks/meat.dm +++ b/code/modules/food&drinks/food/snacks/meat.dm @@ -61,6 +61,11 @@ icon_state = "skeletonmeat" desc = "There's a point where this needs to stop and clearly we have passed it" +/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie + name = "-meat (rotten)" + icon_state = "lizardmeat" //Close enough. + desc = "Halfway to becoming fertilizer for your garden." + /obj/item/weapon/reagent_containers/food/snacks/meat/monkey //same as plain meat diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm new file mode 100644 index 00000000000..fccf13f8e11 --- /dev/null +++ b/code/modules/food&drinks/food/snacks_egg.dm @@ -0,0 +1,132 @@ + +////////////////////////////////////////////EGGS//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/chocolateegg + name = "chocolate egg" + desc = "Such, sweet, fattening food." + icon_state = "chocolateegg" + +/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("sugar", 2) + reagents.add_reagent("coco", 2) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/egg + name = "egg" + desc = "An egg!" + icon_state = "egg" + +/obj/item/weapon/reagent_containers/food/snacks/egg/New() + ..() + reagents.add_reagent("nutriment", 1) + +/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom) + ..() + new/obj/effect/decal/cleanable/egg_smudge(src.loc) + reagents.reaction(hit_atom, TOUCH) + del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes. + +/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype( W, /obj/item/toy/crayon )) + var/obj/item/toy/crayon/C = W + var/clr = C.colourName + + if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow"))) + usr << "[src] refuses to take on this colour!" + return + + usr << "You colour [src] [clr]." + icon_state = "egg-[clr]" + item_color = clr + else + ..() + +/obj/item/weapon/reagent_containers/food/snacks/egg/blue + icon_state = "egg-blue" + item_color = "blue" + +/obj/item/weapon/reagent_containers/food/snacks/egg/green + icon_state = "egg-green" + item_color = "green" + +/obj/item/weapon/reagent_containers/food/snacks/egg/mime + icon_state = "egg-mime" + item_color = "mime" + +/obj/item/weapon/reagent_containers/food/snacks/egg/orange + icon_state = "egg-orange" + item_color = "orange" + +/obj/item/weapon/reagent_containers/food/snacks/egg/purple + icon_state = "egg-purple" + item_color = "purple" + +/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow + icon_state = "egg-rainbow" + item_color = "rainbow" + +/obj/item/weapon/reagent_containers/food/snacks/egg/red + icon_state = "egg-red" + item_color = "red" + +/obj/item/weapon/reagent_containers/food/snacks/egg/yellow + icon_state = "egg-yellow" + item_color = "yellow" + +/obj/item/weapon/reagent_containers/food/snacks/friedegg + name = "fried egg" + desc = "A fried egg, with a touch of salt and pepper." + icon_state = "friedegg" + +/obj/item/weapon/reagent_containers/food/snacks/friedegg/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent("blackpepper", 1) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/boiledegg + name = "boiled egg" + desc = "A hard boiled egg." + icon_state = "egg" + +/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New() + ..() + reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS + name = "omelette du fromage" + desc = "That's all you can say!" + icon_state = "omelette" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/omelette/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user) + if(istype(W,/obj/item/weapon/kitchen/utensil/fork)) + if(W.icon_state == "forkloaded") + user << "You already have omelette on your fork." + return + W.icon_state = "forkloaded" + user.visible_message( \ + "[user] takes a piece of omelette with their fork!", \ + "You take a piece of omelette with your fork!" \ + ) + reagents.remove_reagent("nutriment", 1) + if(reagents.total_volume <= 0) + qdel(src) + +/obj/item/weapon/reagent_containers/food/snacks/benedict + name = "eggs benedict" + desc = "There is only one egg on this, how rude." + icon_state = "benedict" + +/obj/item/weapon/reagent_containers/food/snacks/benedict/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 3 diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm new file mode 100644 index 00000000000..2402a138050 --- /dev/null +++ b/code/modules/food&drinks/food/snacks_meat.dm @@ -0,0 +1,346 @@ +//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu + + +////////////////////////////////////////////FISH//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/cubancarp + name = "\improper Cuban carp" + desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" + icon_state = "cubancarp" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("carpotoxin", 3) + reagents.add_reagent("capsaicin", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/carpmeat + name = "carp fillet" + desc = "A fillet of spess carp meat." + icon_state = "fishfillet" + +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New() + ..() + eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("carpotoxin", 3) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation + name = "imitation carp fillet" + desc = "Almost just like the real thing, kinda." + +/obj/item/weapon/reagent_containers/food/snacks/fishfingers + name = "fish fingers" + desc = "A finger of fish." + icon_state = "fishfingers" + +/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("carpotoxin", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/fishandchips + name = "fish and chips" + desc = "I do say so myself chap." + icon_state = "fishandchips" + +/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("carpotoxin", 3) + bitesize = 3 + +////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/tofu + name = "tofu" + desc = "We all love tofu." + icon_state = "tofu" + +/obj/item/weapon/reagent_containers/food/snacks/tofu/New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 3 + + +/obj/item/weapon/reagent_containers/food/snacks/tomatomeat + name = "tomato slice" + desc = "A slice from a huge tomato." + icon_state = "tomatomeat" + +/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New() + ..() + reagents.add_reagent("nutriment", 3) + src.bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/bearmeat + name = "bear meat" + desc = "A very manly slab of meat." + icon_state = "bearmeat" + +/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New() + ..() + reagents.add_reagent("nutriment", 12) + reagents.add_reagent("hyperzine", 5) + src.bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat + name = "meat" + desc = "A slab of meat" + icon_state = "xenomeat" + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New() + ..() + reagents.add_reagent("nutriment", 3) + src.bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/spidermeat + name = "spider meat" + desc = "A slab of spider meat." + icon_state = "spidermeat" + +/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("toxin", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/spiderleg + name = "spider leg" + desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" + icon_state = "spiderleg" + +/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("toxin", 2) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/cornedbeef + name = "corned beef and cabbage" + desc = "Now you can feel like a real tourist vacationing in Ireland." + icon_state = "cornedbeef" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/faggot + name = "faggot" + desc = "A great meal all round. Not a cord of wood." + icon_state = "faggot" + +/obj/item/weapon/reagent_containers/food/snacks/faggot/New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sausage + name = "sausage" + desc = "A piece of mixed, long meat." + icon_state = "sausage" + +/obj/item/weapon/reagent_containers/food/snacks/sausage/New() + ..() + eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") + reagents.add_reagent("nutriment", 6) + bitesize = 2 + + +/obj/item/weapon/reagent_containers/food/snacks/wingfangchu + name = "wing fang chu" + desc = "A savory dish of alien wing wang in soy." + icon_state = "wingfangchu" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/human/kebab + name = "-kebab" + icon_state = "kebab" + desc = "A human meat, on a stick." + trash = /obj/item/stack/rods + +/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/monkeykebab + name = "meat-kebab" + icon_state = "kebab" + desc = "Delicious meat, on a stick." + trash = /obj/item/stack/rods + +/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/tofukebab + name = "tofu-kebab" + icon_state = "kebab" + desc = "Vegan meat, on a stick." + trash = /obj/item/stack/rods + +/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/meatsteak + name = "meat steak" + desc = "A piece of hot spicy meat." + icon_state = "meatsteak" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent("blackpepper", 1) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube + name = "monkey cube" + desc = "Just add water!" + icon_state = "monkeycube" + bitesize = 12 + wrapped = 0 + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New() + ..() + reagents.add_reagent("nutriment",10) + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity) + if(!proximity) return + if(istype(O,/obj/structure/sink) && !wrapped) + user << "You place [src] under a stream of water..." + user.drop_item() + loc = get_turf(O) + return Expand() + ..() + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user) + if(wrapped) + Unwrap(user) + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand() + visible_message("[src] expands!") + new /mob/living/carbon/monkey(get_turf(src)) + qdel(src) + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user) + icon_state = "monkeycube" + desc = "Just add water!" + user << "You unwrap the cube." + wrapped = 0 + + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped + desc = "Still wrapped in some paper." + icon_state = "monkeycubewrap" + wrapped = 1 + +/obj/item/weapon/reagent_containers/food/snacks/enchiladas + name = "enchiladas" + desc = "Viva La Mexico!" + icon_state = "enchiladas" + +/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New() + ..() + reagents.add_reagent("nutriment",8) + reagents.add_reagent("capsaicin", 6) + bitesize = 4 + +/obj/item/weapon/reagent_containers/food/snacks/stew + name = "stew" + desc = "A nice and warm stew. Healthy and strong." + icon_state = "stew" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/stew/New() + ..() + eatverb = pick("slurp","sip","suck","inhale","drink") + reagents.add_reagent("nutriment", 10) + reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent("imidazoline", 5) + reagents.add_reagent("water", 5) + bitesize = 10 + +/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat + name = "stewed soy meat" + desc = "Even non-vegetarians will LOVE this!" + icon_state = "stewedsoymeat" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New() + ..() + eatverb = pick("slurp","sip","suck","inhale","drink") + reagents.add_reagent("nutriment", 8) + bitesize = 2 + + +/* No more of this +/obj/item/weapon/reagent_containers/food/snacks/telebacon + name = "tele bacon" + desc = "It tastes a little odd but it is still delicious." + icon_state = "bacon" + var/obj/item/device/radio/beacon/bacon/baconbeacon + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/telebacon/New() + ..() + reagents.add_reagent("nutriment", 4) + baconbeacon = new /obj/item/device/radio/beacon/bacon(src) +/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume() + if(!reagents.total_volume) + baconbeacon.loc = usr + baconbeacon.digest_delay() +*/ + + +/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg + name = "boiled spider leg" + desc = "A giant spider's leg that's still twitching after being cooked. Gross!" + icon_state = "spiderlegcooked" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("toxin", 2) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/spidereggsham + name = "green eggs and ham" + desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" + icon_state = "spidereggsham" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent("toxin", 3) + bitesize = 4 + +/obj/item/weapon/reagent_containers/food/snacks/sashimi + name = "carp sashimi" + desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." + icon_state = "sashimi" + +/obj/item/weapon/reagent_containers/food/snacks/sashimi/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("toxin", 5) + bitesize = 3 diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm new file mode 100644 index 00000000000..4a4380cfeea --- /dev/null +++ b/code/modules/food&drinks/food/snacks_other.dm @@ -0,0 +1,232 @@ + +////////////////////////////////////////////OTHER//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/candy_corn + name = "candy corn" + desc = "It's a handful of candy corn. Can be stored in a detective's hat." + icon_state = "candy_corn" + +/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("sugar", 2) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar + name = "chocolate bar" + desc = "Such, sweet, fattening food." + icon_state = "chocolatebarunwrapped" + wrapped = 0 + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sugar", 2) + reagents.add_reagent("coco", 2) + +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user) + if(wrapped) + Unwrap(user) + else + ..() + +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user) + icon_state = "chocolatebarunwrapped" + desc = "It won't make you all sticky." + user << "You remove the foil." + wrapped = 0 + + +/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/wrapped + desc = "It's wrapped in some foil." + icon_state = "chocolatebar" + wrapped = 1 + +/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice + name = "huge mushroom slice" + desc = "A slice from a huge mushroom." + icon_state = "hugemushroomslice" + +/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New() + ..() + reagents.add_reagent("nutriment", 3) + src.bitesize = 3 + + +/obj/item/weapon/reagent_containers/food/snacks/popcorn + name = "popcorn" + desc = "Now let's find some cinema." + icon_state = "popcorn" + trash = /obj/item/trash/popcorn + var/unpopped = 0 + +/obj/item/weapon/reagent_containers/food/snacks/popcorn/New() + ..() + eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp") + unpopped = rand(1,10) + reagents.add_reagent("nutriment", 2) + bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 + +/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume() + if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE + usr << "You bite down on an un-popped kernel, and it hurts your teeth!" + unpopped = max(0, unpopped-1) + reagents.add_reagent("sacid",0.1) //only a little tingle. + ..() + +/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato + name = "loaded baked potato" + desc = "Totally baked." + icon_state = "loadedbakedpotato" + +/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/fries + name = "space fries" + desc = "AKA: French Fries, Freedom Fries, etc." + icon_state = "fries" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/fries/New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/soydope + name = "soy dope" + desc = "Dope from a soy." + icon_state = "soydope" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/soydope/New() + ..() + reagents.add_reagent("nutriment", 2) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/cheesyfries + name = "cheesy fries" + desc = "Fries. Covered in cheese. Duh." + icon_state = "cheesyfries" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/badrecipe + name = "burned mess" + desc = "Someone should be demoted from chef for this." + icon_state = "badrecipe" + +/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New() + ..() + eatverb = pick("choke down","nibble","gnaw","chomp") + reagents.add_reagent("toxin", 1) + reagents.add_reagent("carbon", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff + name = "spacy liberty duff" + desc = "Jello gelatin, from Alfred Hubbard's cookbook." + icon_state = "spacylibertyduff" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("mushroomhallucinogen", 6) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/amanitajelly + name = "amanita jelly" + desc = "Looks curiously toxic." + icon_state = "amanitajelly" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("amatoxin", 6) + reagents.add_reagent("mushroomhallucinogen", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/carrotfries + name = "carrot fries" + desc = "Tasty fries from fresh Carrots." + icon_state = "carrotfries" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("imidazoline", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/candiedapple + name = "candied apple" + desc = "An apple coated in sugary sweetness." + icon_state = "candiedapple" + +/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 3 + +/* +/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore + name = "Boiled slime Core" + desc = "A boiled red thing." + icon_state = "boiledslimecore" + +/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New() + ..() + reagents.add_reagent("slimejelly", 5) + bitesize = 3 +*/ +/obj/item/weapon/reagent_containers/food/snacks/mint + name = "mint" + desc = "it is only wafer thin." + icon_state = "mint" + +/obj/item/weapon/reagent_containers/food/snacks/mint/New() + ..() + reagents.add_reagent("minttoxin", 1) + bitesize = 1 + +////////////////////////////////FOOD ADDITIONS//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/wrap + name = "egg wrap" + desc = "The precursor to Pigs in a Blanket." + icon_state = "wrap" + +/obj/item/weapon/reagent_containers/food/snacks/wrap/New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/beans + name = "tin of beans" + desc = "Musical fruit in a slightly less musical container." + icon_state = "beans" + +/obj/item/weapon/reagent_containers/food/snacks/beans/New() + ..() + reagents.add_reagent("nutriment", 10) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/spidereggs + name = "spider eggs" + desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health." + icon_state = "spidereggs" + +/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("toxin", 3) + bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm new file mode 100644 index 00000000000..1c55584b00b --- /dev/null +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -0,0 +1,309 @@ +//Pastry is a food that is made from dough which is made from wheat or rye flour. +//This file contains pastries that don't fit any existing categories. + +////////////////////////////////////////////DONUTS//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/donut + name = "donut" + icon_state = "donut1" + +/obj/item/weapon/reagent_containers/food/snacks/donut/normal + desc = "Goes great with Robust Coffee." + +/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sprinkles", 1) + src.bitesize = 3 + if(prob(30)) + src.icon_state = "donut2" + src.name = "frosted donut" + reagents.add_reagent("sprinkles", 2) + +/obj/item/weapon/reagent_containers/food/snacks/donut/chaos + name = "chaos donut" + desc = "Like life, it never quite tastes the same." + +/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("sprinkles", 1) + bitesize = 10 + switch(rand(1,10)) + if(1) + reagents.add_reagent("nutriment", 3) + if(2) + reagents.add_reagent("capsaicin", 3) + if(3) + reagents.add_reagent("frostoil", 3) + if(4) + reagents.add_reagent("sprinkles", 3) + if(5) + reagents.add_reagent("plasma", 3) + if(6) + reagents.add_reagent("coco", 3) + if(7) + reagents.add_reagent("slimejelly", 3) + if(8) + reagents.add_reagent("banana", 3) + if(9) + reagents.add_reagent("berryjuice", 3) + if(10) + reagents.add_reagent("tricordrazine", 3) + if(prob(30)) + icon_state = "donut2" + name = "frosted chaos donut" + reagents.add_reagent("sprinkles", 2) + + +/obj/item/weapon/reagent_containers/food/snacks/donut/jelly + name = "jelly donut" + desc = "You jelly?" + icon_state = "jdonut1" + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + if(prob(30)) + icon_state = "jdonut2" + name = "Frosted Jelly Donut" + reagents.add_reagent("sprinkles", 2) + +/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly + name = "jelly donut" + desc = "You jelly?" + icon_state = "jdonut1" + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("slimejelly", 5) + bitesize = 5 + if(prob(30)) + icon_state = "jdonut2" + name = "Frosted Jelly Donut" + reagents.add_reagent("sprinkles", 2) + +/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly + name = "jelly donut" + desc = "You jelly?" + icon_state = "jdonut1" + bitesize = 5 + +/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New() + ..() + reagents.add_reagent("nutriment", 3) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("cherryjelly", 5) + if(prob(30)) + icon_state = "jdonut2" + name = "Frosted Jelly Donut" + reagents.add_reagent("sprinkles", 2) + + +////////////////////////////////////////////MUFFINS//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/muffin + name = "muffin" + desc = "A delicious and spongy little cake." + icon_state = "muffin" + +/obj/item/weapon/reagent_containers/food/snacks/muffin/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/muffin/berry + name = "berry muffin" + icon_state = "berrymuffin" + desc = "A delicious and spongy little cake, with berries." + +/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry + name = "booberry muffin" + icon_state = "berrymuffin" + alpha = 125 + desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" + +/obj/item/weapon/reagent_containers/food/snacks/chawanmushi + name = "chawanmushi" + desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat." + icon_state = "chawanmushi" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 1 +////////////////////////////////////////////WAFFLES//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/waffles + name = "waffles" + desc = "Mmm, waffles." + icon_state = "waffles" + trash = /obj/item/trash/waffles + +/obj/item/weapon/reagent_containers/food/snacks/waffles/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/soylentgreen + name = "\improper Soylent Green" + desc = "Not made of people. Honest." //Totally people. + icon_state = "soylent_green" + trash = /obj/item/trash/waffles + +/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New() + ..() + reagents.add_reagent("nutriment", 10) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/soylenviridians + name = "\improper Soylent Virdians" + desc = "Not made of people. Honest." //Actually honest for once. + icon_state = "soylent_yellow" + trash = /obj/item/trash/waffles + +/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New() + ..() + reagents.add_reagent("nutriment", 10) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles + name = "roffle waffles" + desc = "Waffles from Roffle. Co." + icon_state = "rofflewaffles" + trash = /obj/item/trash/waffles + +/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New() + ..() + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("mushroomhallucinogen", 8) + bitesize = 4 + +////////////////////////////////////////////OTHER//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/cookie + name = "cookie" + desc = "COOKIE!!!" + icon_state = "COOKIE!!!" + +/obj/item/weapon/reagent_containers/food/snacks/cookie/New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket + name = "\improper Donk-pocket" + desc = "The food of choice for the seasoned traitor." + icon_state = "donkpocket" + var/warm = 0 + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New() + ..() + reagents.add_reagent("nutriment", 4) + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp? + if(warm) + spawn(4200) //ew + warm = 0 + reagents.del_reagent("tricordrazine") + name = initial(name) + return + +/obj/item/weapon/reagent_containers/food/snacks/fortunecookie + name = "fortune cookie" + desc = "A true prophecy in each cookie!" + icon_state = "fortune_cookie" + +/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/poppypretzel + name = "poppy pretzel" + desc = "It's all twisted up!" + icon_state = "poppypretzel" + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 2 + + +/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit + name = "plump helmet biscuit" + desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." + icon_state = "phelmbiscuit" + +/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New() + ..() + if(prob(10)) + name = "exceptional plump helmet biscuit" + desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("tricordrazine", 5) + bitesize = 2 + else + reagents.add_reagent("nutriment", 5) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/appletart + name = "golden apple streusel tart" + desc = "A tasty dessert that won't make it through a metal detector." + icon_state = "gappletart" + trash = /obj/item/trash/plate + +/obj/item/weapon/reagent_containers/food/snacks/appletart/New() + ..() + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("gold", 5) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/cracker + name = "cracker" + desc = "It's a salted cracker." + icon_state = "cracker" + +/obj/item/weapon/reagent_containers/food/snacks/cracker/New() + ..() + reagents.add_reagent("nutriment", 1) + +/obj/item/weapon/reagent_containers/food/snacks/hotdog + name = "hotdog" + desc = "Fresh footlong ready to go down on." + icon_state = "hotdog" + +/obj/item/weapon/reagent_containers/food/snacks/hotdog/New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("ketchup", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/meatbun + name = "meat bun" + desc = "Has the potential to not be Dog." + icon_state = "meatbun" + +/obj/item/weapon/reagent_containers/food/snacks/meatbun/New() + ..() + reagents.add_reagent("nutriment", 6) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/sugarcookie + name = "sugar cookie" + desc = "Just like your little sister used to make." + icon_state = "sugarcookie" + +/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New() + ..() + reagents.add_reagent("nutriment", 2) + reagents.add_reagent("sugar", 5) + bitesize = 2 \ No newline at end of file diff --git a/code/modules/food&drinks/food/snacks_pies.dm b/code/modules/food&drinks/food/snacks_pie.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_pies.dm rename to code/modules/food&drinks/food/snacks_pie.dm diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm new file mode 100644 index 00000000000..8b8cb86b799 --- /dev/null +++ b/code/modules/food&drinks/food/snacks_salad.dm @@ -0,0 +1,38 @@ +//this category is very little but I think that it has great potential to grow +////////////////////////////////////////////SALAD//////////////////////////////////////////// + +/obj/item/weapon/reagent_containers/food/snacks/aesirsalad + name = "\improper Aesir salad" + desc = "Probably too incredible for mortal men to fully enjoy." + icon_state = "aesirsalad" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New() + ..() + eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("tricordrazine", 8) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/herbsalad + name = "herb salad" + desc = "A tasty salad with apples on top." + icon_state = "herbsalad" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New() + ..() + reagents.add_reagent("nutriment", 8) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/validsalad + name = "valid salad" + desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." + icon_state = "validsalad" + trash = /obj/item/trash/snack_bowl + +/obj/item/weapon/reagent_containers/food/snacks/validsalad/New() + ..() + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("doctorsdelight", 5) + bitesize = 3 \ No newline at end of file diff --git a/code/modules/food&drinks/food/snacks_vend.dm b/code/modules/food&drinks/food/snacks_vend.dm new file mode 100644 index 00000000000..465c33d925e --- /dev/null +++ b/code/modules/food&drinks/food/snacks_vend.dm @@ -0,0 +1,81 @@ +////////////////////////////////////////////SNACKS FROM VENDING MACHINES//////////////////////////////////////////// +//in other words: junk food +//don't even bother looking for recipes for these + +/obj/item/weapon/reagent_containers/food/snacks/candy + name = "candy" + desc = "Nougat love it or hate it." + icon_state = "candy" + trash = /obj/item/trash/candy + +/obj/item/weapon/reagent_containers/food/snacks/candy/New() + ..() + reagents.add_reagent("nutriment", 1) + reagents.add_reagent("sugar", 3) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sosjerky + name = "\improper Scaredy's Private Reserve Beef Jerky" + icon_state = "sosjerky" + desc = "Beef jerky made from the finest space cows." + trash = /obj/item/trash/sosjerky + +/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/chips + name = "chips" + desc = "Commander Riker's What-The-Crisps" + icon_state = "chips" + trash = /obj/item/trash/chips + +/obj/item/weapon/reagent_containers/food/snacks/chips/New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/no_raisin + name = "4no raisins" + icon_state = "4no_raisins" + desc = "Best raisins in the universe. Not sure why." + trash = /obj/item/trash/raisins + +/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New() + ..() + reagents.add_reagent("nutriment", 6) + +/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie + name = "space twinkie" + icon_state = "space_twinkie" + desc = "Guaranteed to survive longer than you will." + +/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New() + ..() + reagents.add_reagent("sugar", 4) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers + name = "cheesie honkers" + desc = "Bite sized cheesie snacks that will honk all over your mouth." + icon_state = "cheesie_honkers" + trash = /obj/item/trash/cheesie + +/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/syndicake + name = "syndi-cakes" + icon_state = "syndi_cakes" + desc = "An extremely moist snack cake that tastes just as good after being nuked." + trash = /obj/item/trash/syndi_cakes + +/obj/item/weapon/reagent_containers/food/snacks/syndicake/New() + ..() + reagents.add_reagent("nutriment", 4) + reagents.add_reagent("doctorsdelight", 5) + bitesize = 3 + diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index c43c4bec814..654b4c9c7d9 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -110,7 +110,7 @@ set name = "empty gibber" set src in oview(1) - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.go_out() add_fingerprint(usr) diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm index e575d930dfd..0fb80d32a8b 100644 --- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm +++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm @@ -1,50 +1,9 @@ #define ICECREAM_VANILLA 1 -#define FLAVOUR_CHOCOLATE 2 -#define FLAVOUR_STRAWBERRY 3 -#define FLAVOUR_BLUE 4 +#define ICECREAM_CHOCOLATE 2 +#define ICECREAM_STRAWBERRY 3 +#define ICECREAM_BLUE 4 #define CONE_WAFFLE 5 #define CONE_CHOC 6 -#define INGR_MILK 7 -#define INGR_FLOUR 8 -#define INGR_SUGAR 9 -#define INGR_ICE 10 -#define MUCK 11 - -var/list/ingredients_source = list( -"berryjuice" = FLAVOUR_STRAWBERRY,\ -"coco" = FLAVOUR_CHOCOLATE,\ -"singulo" = FLAVOUR_BLUE,\ -"milk" = INGR_MILK,\ -"soymilk" = INGR_MILK,\ -"ice" = INGR_ICE,\ -"flour" = INGR_FLOUR,\ -"sugar" = INGR_SUGAR,\ -) - -/proc/get_icecream_flavour_string(var/flavour_type) - switch(flavour_type) - if(FLAVOUR_CHOCOLATE) - return "chocolate" - if(FLAVOUR_STRAWBERRY) - return "strawberry" - if(FLAVOUR_BLUE) - return "blue" - if(CONE_WAFFLE) - return "waffle" - if(CONE_CHOC) - return "chocolate" - if(INGR_MILK) - return "milk" - if(INGR_FLOUR) - return "flour" - if(INGR_SUGAR) - return "sugar" - if(INGR_ICE) - return "ice" - if(MUCK) - return "muck" - else - return "vanilla" /obj/machinery/icecream_vat name = "icecream vat" @@ -53,15 +12,54 @@ var/list/ingredients_source = list( icon_state = "icecream_vat" density = 1 anchored = 0 - var/list/ingredients = list() + use_power = 0 + var/list/product_types = list() var/dispense_flavour = ICECREAM_VANILLA - var/obj/item/weapon/reagent_containers/glass/held_container + var/flavour_name = "vanilla" + flags = OPENCONTAINER | NOREACT + reagents = new() + +/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) + switch(type) + if(ICECREAM_CHOCOLATE) + return list("milk", "ice", "coco") + if(ICECREAM_STRAWBERRY) + return list("milk", "ice", "berryjuice") + if(ICECREAM_BLUE) + return list("milk", "ice", "singulo") + if(CONE_WAFFLE) + return list("flour", "sugar") + if(CONE_CHOC) + return list("flour", "sugar", "coco") + else + return list("milk", "ice") + + +/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) + switch(flavour_type) + if(ICECREAM_CHOCOLATE) + return "chocolate" + if(ICECREAM_STRAWBERRY) + return "strawberry" + if(ICECREAM_BLUE) + return "blue" + if(CONE_WAFFLE) + return "waffle" + if(CONE_CHOC) + return "chocolate" + else + return "vanilla" + /obj/machinery/icecream_vat/New() ..() - - while(ingredients.len < 11) - ingredients.Add(5) + while(product_types.len < 6) + product_types.Add(5) + reagents.my_atom = src + reagents.add_reagent("milk", 5) + reagents.add_reagent("flour", 5) + reagents.add_reagent("sugar", 5) + reagents.add_reagent("ice", 5) /obj/machinery/icecream_vat/attack_hand(mob/user as mob) user.set_machine(src) @@ -69,140 +67,97 @@ var/list/ingredients_source = list( /obj/machinery/icecream_vat/interact(mob/user as mob) var/dat - dat += "Dispense vanilla icecream There is [ingredients[ICECREAM_VANILLA]] scoops of vanilla icecream left (made from milk and ice). " - dat += "Dispense strawberry icecream There is [ingredients[FLAVOUR_STRAWBERRY]] dollops of strawberry flavouring left (obtained from berry juice. " - dat += "Dispense chocolate icecream There is [ingredients[FLAVOUR_CHOCOLATE]] dollops of chocolate flavouring left (obtained from cocoa powder). " - dat += "Dispense blue icecream There is [ingredients[FLAVOUR_BLUE]] dollops of blue flavouring left (obtained from bluespace tomato singulo). " + dat += "ICECREAM "
+ dat += "Dispensing: [flavour_name] icecream "
+ dat += "" + dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice) " + dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice) " + dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder) " + dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo) CONES "
+ dat += "Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar) "
dat += "" + dat += "Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder) " - dat += "Dispense waffle cones There are [ingredients[CONE_WAFFLE]] waffle cones left. " - dat += "Dispense chocolate cones There are [ingredients[CONE_CHOC]] chocolate cones left. " - dat += " " - dat += "Make waffle cones There is [ingredients[INGR_FLOUR]]/[ingredients[INGR_SUGAR]] of flour and sugar left. " - dat += "Make chocolate cones There is [ingredients[FLAVOUR_CHOCOLATE]]/[ingredients[CONE_WAFFLE]] of chocolate flavouring and waffle cones left. " - dat += "Make vanilla icecream There is [ingredients[INGR_MILK]]/[ingredients[INGR_ICE]] of milk and ice left. " - dat += " " - if(held_container) - dat += "Eject [held_container] " - else - dat += "No beaker inserted. " + dat += "VAT CONTENT " + for(var/datum/reagent/R in reagents.reagent_list) + dat += "[R.name]: [R.volume]" + dat += "Purge " dat += "Refresh Close" - var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 400, src) + var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) popup.set_content(dat) popup.open() /obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers)) - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream)) - var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O - if(!I.ice_creamed) - if(ingredients[ICECREAM_VANILLA] > 0) - var/flavour_name = get_icecream_flavour_string(dispense_flavour) - if(ingredients[dispense_flavour] > 0) - src.visible_message("\icon[src] [user] scoops delicious [flavour_name] flavoured icecream into [I].") - ingredients[dispense_flavour] -= 1 - ingredients[ICECREAM_VANILLA] -= 1 + if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream)) + var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O + if(!I.ice_creamed) + if(product_types[dispense_flavour] > 0) + src.visible_message("\icon[src] [user] scoops delicious [flavour_name] icecream into [I].") + product_types[dispense_flavour] -= 1 - I.add_ice_cream(dispense_flavour) - if(held_container) - held_container.reagents.trans_to(I, 10) - if(I.reagents.total_volume < 10) - I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) - else - user << "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients." - else - user << "There is not enough icecream left! Insert more milk and ice." + I.add_ice_cream(flavour_name) + // if(beaker) + // beaker.reagents.trans_to(I, 10) + if(I.reagents.total_volume < 10) + I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) else - user << "[O] already has icecream in it." - else if(istype(O, /obj/item/weapon/reagent_containers/glass)) - if(held_container) - user << "You must remove [held_container] from [src] first." - else - user << "You insert [O] into [src]." - user.drop_item() - O.loc = src - held_container = O + user << "There is not enough icecream left!" else - var/obj/item/weapon/reagent_containers/R = O - if(R.reagents) - src.visible_message("[user] has emptied all of [R] into [src].") - for (var/datum/reagent/current_reagent in R.reagents.reagent_list) - if(ingredients_source[current_reagent.id]) - add(ingredients_source[current_reagent.id], current_reagent.volume / 2) - else - add(MUCK, current_reagent.volume / 5) - R.reagents.clear_reagents() + user << "[O] already has icecream in it." return 1 + else if(O.is_open_container()) + return else ..() -/obj/machinery/icecream_vat/proc/add(var/add_type, var/amount) - if(add_type <= ingredients.len) - ingredients[add_type] += amount - updateDialog() - -/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type) - switch(make_type) - if(CONE_WAFFLE) - if(ingredients[INGR_FLOUR] > 0 && ingredients[INGR_SUGAR] > 0) - var/amount = max( min(ingredients[INGR_FLOUR], ingredients[INGR_SUGAR]), 5) - ingredients[INGR_FLOUR] -= amount - ingredients[INGR_SUGAR] -= amount - ingredients[CONE_WAFFLE] += amount - src.visible_message("[user] cooks up some waffle cones.") - else - user << "You require sugar and flour to make waffle cones." - if(CONE_CHOC) - if(ingredients[FLAVOUR_CHOCOLATE] > 0 && ingredients[CONE_WAFFLE] > 0) - var/amount = min(ingredients[CONE_WAFFLE], ingredients[FLAVOUR_CHOCOLATE]) - ingredients[CONE_WAFFLE] -= amount - ingredients[FLAVOUR_CHOCOLATE] -= amount - ingredients[CONE_CHOC] += amount - src.visible_message("[user] cooks up some chocolate cones.") - else - user << "You require waffle cones and chocolate flavouring to make chocolate cones." - if(ICECREAM_VANILLA) - if(ingredients[INGR_ICE] > 0 && ingredients[INGR_MILK] > 0) - var/amount = min(ingredients[INGR_ICE], ingredients[INGR_MILK]) - ingredients[INGR_ICE] -= amount - ingredients[INGR_MILK] -= amount - ingredients[ICECREAM_VANILLA] += amount - src.visible_message("[user] whips up some vanilla icecream.") - else - user << "You require milk and ice to make vanilla icecream." - updateDialog() +/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount) + for(var/R in get_ingredient_list(make_type)) + if(reagents.has_reagent(R, amount)) + continue + amount = 0 + break + if(amount) + for(var/R in get_ingredient_list(make_type)) + reagents.remove_reagent(R, amount) + product_types[make_type] += amount + var/flavour = get_flavour_name(make_type) + if(make_type > 4) + src.visible_message("[user] cooks up some [flavour] cones.") + else + src.visible_message("[user] whips up some [flavour] icecream.") + else + user << "You don't have the ingredients to make this." /obj/machinery/icecream_vat/Topic(href, href_list) if(..()) return - if(href_list["dispense"]) - dispense_flavour = text2num(href_list["dispense"]) - src.visible_message("[usr] sets [src] to dispense [get_icecream_flavour_string(dispense_flavour)] flavoured icecream.") + if(href_list["select"]) + dispense_flavour = text2num(href_list["select"]) + flavour_name = get_flavour_name(dispense_flavour) + src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured icecream.") if(href_list["cone"]) var/dispense_cone = text2num(href_list["cone"]) - if(ingredients[dispense_cone] <= ingredients.len) - var/cone_name = get_icecream_flavour_string(dispense_cone) - if(ingredients[dispense_cone] >= 1) - ingredients[dispense_cone] -= 1 - var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc) - I.cone_type = cone_name - I.icon_state = "icecream_cone_[cone_name]" - I.desc = "Delicious [cone_name] cone, but no ice cream." - src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") - else - usr << "There are no [cone_name] cones left!" - updateDialog() + var/cone_name = get_flavour_name(dispense_cone) + if(product_types[dispense_cone] >= 1) + product_types[dispense_cone] -= 1 + var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc) + I.cone_type = cone_name + I.icon_state = "icecream_cone_[cone_name]" + I.desc = "Delicious [cone_name] cone, but no ice cream." + src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") + else + usr << "There are no [cone_name] cones left!" if(href_list["make"]) - make( usr, text2num(href_list["make"]) ) - updateDialog() + var/amount = (text2num(href_list["amount"])) + var/C = text2num(href_list["make"]) + make(usr, C, amount) - if(href_list["eject"]) - if(held_container) - held_container.loc = src.loc - held_container = null - updateDialog() + if(href_list["disposeI"]) + reagents.del_reagent(href_list["disposeI"]) + + updateDialog() if(href_list["refresh"]) updateDialog() @@ -226,8 +181,7 @@ var/list/ingredients_source = list( create_reagents(20) reagents.add_reagent("nutriment", 5) -/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour) - var/flavour_name = get_icecream_flavour_string(flavour) +/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) name = "[flavour_name] icecream" src.overlays += "icecream_[flavour_name]" desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream." @@ -239,8 +193,3 @@ var/list/ingredients_source = list( #undef FLAVOUR_BLUE #undef CONE_WAFFLE #undef CONE_CHOC -#undef INGR_MILK -#undef INGR_FLOUR -#undef INGR_SUGAR -#undef INGR_ICE -#undef MUCK diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm index 80ba39354a3..94696028027 100644 --- a/code/modules/food&drinks/kitchen machinery/juicer.dm +++ b/code/modules/food&drinks/kitchen machinery/juicer.dm @@ -126,7 +126,7 @@ set category = "Object" set name = "Detach Beaker from the juicer" set src in oview(1) - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return if (!beaker) return diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm index 247b6721383..b44170fd2da 100644 --- a/code/modules/food&drinks/kitchen machinery/microwave.dm +++ b/code/modules/food&drinks/kitchen machinery/microwave.dm @@ -122,11 +122,12 @@ return 1 else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them + var/obj/item/weapon/soap/P = O user.visible_message( \ "[user] starts to clean the microwave.", \ "You start to clean the microwave." \ ) - if (do_after(user,20)) + if (do_after(user, P.cleanspeed)) user.visible_message( \ "[user] has cleaned the microwave.", \ "You have cleaned the microwave." \ diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm index 7ec3d44356e..8ef77de2a02 100644 --- a/code/modules/food&drinks/kitchen machinery/processor.dm +++ b/code/modules/food&drinks/kitchen machinery/processor.dm @@ -157,7 +157,7 @@ set name = "Eject Contents" set src in oview(1) - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.empty() add_fingerprint(usr) diff --git a/code/modules/food&drinks/recipes/microwave/recipes.dm b/code/modules/food&drinks/recipes/microwave/recipes.dm index 17c76c10d25..4bf797f5bf7 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes.dm @@ -1,334 +1,6 @@ // see code/datums/recipe.dm -////////////////////////////////////////////////EGG RECIPE's//////////////////////////////////////////////// - -/datum/recipe/egg/fried - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg - ) - result = /obj/item/weapon/reagent_containers/food/snacks/friedegg - -/datum/recipe/egg/boiled - reagents = list("water" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg - ) - result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg - -/datum/recipe/egg/omelette - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/omelette - -/datum/recipe/egg/chocolate - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg - -/datum/recipe/egg/benedict - items = list( - /obj/item/weapon/reagent_containers/food/snacks/friedegg, - /obj/item/weapon/reagent_containers/food/snacks/meatsteak, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/benedict - -////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// - -/datum/recipe/donut - reagents = list("flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg - ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal - -/datum/recipe/donut/jelly - reagents = list("berryjuice" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg - ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly - -/datum/recipe/donut/jelly/slime - reagents = list("slimejelly" = 5, "flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly - -/datum/recipe/donut/jelly/cherry - reagents = list("cherryjelly" = 5, "flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly - -/datum/recipe/chaosdonut - reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg - ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos - - -////////////////////////////////////////////////WAFFLES//////////////////////////////////////////////// - -/datum/recipe/waffles - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/waffles - - -/datum/recipe/waffles/soylenviridians - reagents = list("flour" = 15) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans - ) - result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians - -/datum/recipe/waffles/soylentgreen - reagents = list("flour" = 15) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen - - -/datum/recipe/waffles/roffle - reagents = list("mushroomhallucinogen" = 5, "flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles - - -////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// - -/datum/recipe/donkpocket - reagents = list("flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/faggot, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL - proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked) - being_cooked.warm = 1 - being_cooked.reagents.add_reagent("tricordrazine", 5) - being_cooked.bitesize = 6 - being_cooked.name = "Warm " + being_cooked.name - being_cooked.cooltime() - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container) - warm_up(being_cooked) - return being_cooked - -/datum/recipe/donkpocket/warm - reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour - items = list( - /obj/item/weapon/reagent_containers/food/snacks/donkpocket - ) - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container - if(being_cooked && !being_cooked.warm) - warm_up(being_cooked) - return being_cooked - - -////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// - -/datum/recipe/muffin - reagents = list("milk" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/muffin - -/datum/recipe/muffin/berry - reagents = list("milk" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/grown/berries - ) - result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry - -/datum/recipe/muffin/booberry - reagents = list("milk" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/grown/berries, - /obj/item/weapon/ectoplasm - ) - result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry - -/datum/recipe/muffin/chawanmushi - reagents = list("water" = 5, "soysauce" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi - - - -////////////////////////////////////////////////KEBABS NO REMOVE//////////////////////////////////////////////// - -/datum/recipe/kebab/human - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab - -/datum/recipe/kebab/monkey - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab - -/datum/recipe/kebab/tofu - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab - -////////////////////////////////////////////////FISH//////////////////////////////////////////////// - -/datum/recipe/carpmeat - reagents = list("carpotoxin" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tofu - ) - result = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation - -/datum/recipe/cubancarp - reagents = list("flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/chili, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp - -/datum/recipe/fishandchips - items = list( - /obj/item/weapon/reagent_containers/food/snacks/fries, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips - -/datum/recipe/fishfingers - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers - -/datum/recipe/sashimi - reagents = list("soysauce" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/spidereggs, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sashimi - -////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// - -/datum/recipe/pizza/margherita - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita - -/datum/recipe/pizza/meat - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza - -/datum/recipe/pizza/mushroom - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza - -/datum/recipe/pizza/vegetable - reagents = list("flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, - /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, - /obj/item/weapon/reagent_containers/food/snacks/grown/corn, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza - - - -////////////////////////////////////////////////SALADS//////////////////////////////////////////////// - -/datum/recipe/salad/herb - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/apple, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container) - being_cooked.reagents.del_reagent("toxin") - return being_cooked - -/datum/recipe/salad/aesir - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, - /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad - -/datum/recipe/salad/valid - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, - /obj/item/weapon/reagent_containers/food/snacks/grown/potato, - /obj/item/weapon/reagent_containers/food/snacks/faggot, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/validsalad - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container) - being_cooked.reagents.del_reagent("toxin") - return being_cooked - ////////////////////////////////////////////////FOOD ADDITTIONS//////////////////////////////////////////////// /datum/recipe/wrap @@ -347,62 +19,8 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/beans -/datum/recipe/hotdog - reagents = list("ketchup" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/sausage, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/hotdog - -/datum/recipe/meatbun - reagents = list("soysauce" = 5, "flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/faggot, - /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatbun - -/datum/recipe/sugarcookie - reagents = list("flour" = 5, "sugar" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie - -/datum/recipe/boiledspiderleg - reagents = list("water" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/spiderleg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg - -/datum/recipe/spidereggsham - reagents = list("sodiumchloride" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/spidereggs, - /obj/item/weapon/reagent_containers/food/snacks/spidermeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham - ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// -/datum/recipe/cornedbeef - reagents = list("sodiumchloride" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, - /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef - -/datum/recipe/wingfangchu - reagents = list("soysauce" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/xenomeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu - /datum/recipe/loadedbakedpotato items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/potato, @@ -423,28 +41,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/popcorn -/datum/recipe/fortunecookie - reagents = list("flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/paper, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie -/datum/recipe/fortunecookie/make_food(var/obj/container as obj) - var/obj/item/weapon/paper/paper = locate() in container - paper.loc = null //prevent deletion - var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container) - paper.loc = being_cooked - being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn - return being_cooked - -/datum/recipe/meatsteak - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak - /datum/recipe/spacylibertyduff reagents = list("water" = 5, "vodka" = 5) items = list( @@ -467,73 +63,9 @@ being_cooked.reagents.del_reagent("amatoxin") return being_cooked -/datum/recipe/enchiladas - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/grown/chili, - /obj/item/weapon/reagent_containers/food/snacks/grown/chili, - /obj/item/weapon/reagent_containers/food/snacks/grown/corn, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas - -/datum/recipe/stew - reagents = list("water" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/grown/potato, - /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, - /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/stew - -/datum/recipe/stewedsoymeat - items = list( - /obj/item/weapon/reagent_containers/food/snacks/soydope, - /obj/item/weapon/reagent_containers/food/snacks/soydope, - /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, - /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat - -/datum/recipe/poppypretzel - reagents = list("flour" = 5) - items = list( - /obj/item/seeds/poppyseed, - /obj/item/weapon/reagent_containers/food/snacks/egg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel - /datum/recipe/candiedapple reagents = list("water" = 5, "sugar" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/grown/apple ) result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple - -/datum/recipe/sausage - items = list( - /obj/item/weapon/reagent_containers/food/snacks/faggot, - /obj/item/weapon/reagent_containers/food/snacks/meat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sausage - -/datum/recipe/plumphelmetbiscuit - reagents = list("flour" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit - -/datum/recipe/appletart - reagents = list("sugar" = 5, "milk" = 5, "flour" = 15) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/appletart - -/datum/recipe/cracker - reagents = list("flour" = 5, "sodiumchloride" = 1) - result = /obj/item/weapon/reagent_containers/food/snacks/cracker diff --git a/code/modules/food&drinks/recipes/microwave/recipes_burgers.dm b/code/modules/food&drinks/recipes/microwave/recipes_burger.dm similarity index 100% rename from code/modules/food&drinks/recipes/microwave/recipes_burgers.dm rename to code/modules/food&drinks/recipes/microwave/recipes_burger.dm diff --git a/code/modules/food&drinks/recipes/microwave/recipes_cakes.dm b/code/modules/food&drinks/recipes/microwave/recipes_cake.dm similarity index 100% rename from code/modules/food&drinks/recipes/microwave/recipes_cakes.dm rename to code/modules/food&drinks/recipes/microwave/recipes_cake.dm diff --git a/code/modules/food&drinks/recipes/microwave/recipes_egg.dm b/code/modules/food&drinks/recipes/microwave/recipes_egg.dm new file mode 100644 index 00000000000..7797053ffbf --- /dev/null +++ b/code/modules/food&drinks/recipes/microwave/recipes_egg.dm @@ -0,0 +1,40 @@ + +////////////////////////////////////////////////EGG RECIPE's//////////////////////////////////////////////// + +/datum/recipe/egg/fried + reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg + ) + result = /obj/item/weapon/reagent_containers/food/snacks/friedegg + +/datum/recipe/egg/boiled + reagents = list("water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg + ) + result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg + +/datum/recipe/egg/omelette + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/omelette + +/datum/recipe/egg/chocolate + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg + +/datum/recipe/egg/benedict + items = list( + /obj/item/weapon/reagent_containers/food/snacks/friedegg, + /obj/item/weapon/reagent_containers/food/snacks/meatsteak, + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/benedict diff --git a/code/modules/food&drinks/recipes/microwave/recipes_meat.dm b/code/modules/food&drinks/recipes/microwave/recipes_meat.dm new file mode 100644 index 00000000000..81506429ae0 --- /dev/null +++ b/code/modules/food&drinks/recipes/microwave/recipes_meat.dm @@ -0,0 +1,145 @@ + +////////////////////////////////////////////////KEBABS NO REMOVE//////////////////////////////////////////////// + +/datum/recipe/kebab/human + items = list( + /obj/item/stack/rods, + /obj/item/weapon/reagent_containers/food/snacks/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/meat/human, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab + +/datum/recipe/kebab/monkey + items = list( + /obj/item/stack/rods, + /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, + /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab + +/datum/recipe/kebab/tofu + items = list( + /obj/item/stack/rods, + /obj/item/weapon/reagent_containers/food/snacks/tofu, + /obj/item/weapon/reagent_containers/food/snacks/tofu, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab + +////////////////////////////////////////////////FISH//////////////////////////////////////////////// + +/datum/recipe/carpmeat + reagents = list("carpotoxin" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tofu + ) + result = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation + +/datum/recipe/cubancarp + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/chili, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp + +/datum/recipe/fishandchips + items = list( + /obj/item/weapon/reagent_containers/food/snacks/fries, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips + +/datum/recipe/fishfingers + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers + +/datum/recipe/sashimi + reagents = list("soysauce" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spidereggs, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sashimi + +////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// + +/datum/recipe/boiledspiderleg + reagents = list("water" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spiderleg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg + +/datum/recipe/spidereggsham + reagents = list("sodiumchloride" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spidereggs, + /obj/item/weapon/reagent_containers/food/snacks/spidermeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham + +////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// + +/datum/recipe/cornedbeef + reagents = list("sodiumchloride" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef + +/datum/recipe/wingfangchu + reagents = list("soysauce" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/xenomeat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu + +/datum/recipe/meatsteak + reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak + +/datum/recipe/enchiladas + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/grown/chili, + /obj/item/weapon/reagent_containers/food/snacks/grown/chili, + /obj/item/weapon/reagent_containers/food/snacks/grown/corn, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas + +/datum/recipe/stew + reagents = list("water" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/grown/potato, + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, + /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/stew + +/datum/recipe/stewedsoymeat + items = list( + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/soydope, + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat + +/datum/recipe/sausage + items = list( + /obj/item/weapon/reagent_containers/food/snacks/faggot, + /obj/item/weapon/reagent_containers/food/snacks/meat, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sausage diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm new file mode 100644 index 00000000000..f4a37c243bb --- /dev/null +++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm @@ -0,0 +1,200 @@ + +////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// + +/datum/recipe/donut + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal + +/datum/recipe/donut/jelly + reagents = list("berryjuice" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly + +/datum/recipe/donut/jelly/slime + reagents = list("slimejelly" = 5, "flour" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly + +/datum/recipe/donut/jelly/cherry + reagents = list("cherryjelly" = 5, "flour" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly + +/datum/recipe/chaosdonut + reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos + + +////////////////////////////////////////////////WAFFLES//////////////////////////////////////////////// + +/datum/recipe/waffles + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/waffles + + +/datum/recipe/waffles/soylenviridians + reagents = list("flour" = 15) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans + ) + result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians + +/datum/recipe/waffles/soylentgreen + reagents = list("flour" = 15) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat/human, + /obj/item/weapon/reagent_containers/food/snacks/meat/human, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen + + +/datum/recipe/waffles/roffle + reagents = list("mushroomhallucinogen" = 5, "flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles + +////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// + +/datum/recipe/donkpocket + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/faggot, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL + proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked) + being_cooked.warm = 1 + being_cooked.reagents.add_reagent("tricordrazine", 5) + being_cooked.bitesize = 6 + being_cooked.name = "Warm " + being_cooked.name + being_cooked.cooltime() + make_food(var/obj/container as obj) + var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container) + warm_up(being_cooked) + return being_cooked + +/datum/recipe/donkpocket/warm + reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour + items = list( + /obj/item/weapon/reagent_containers/food/snacks/donkpocket + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL + make_food(var/obj/container as obj) + var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container + if(being_cooked && !being_cooked.warm) + warm_up(being_cooked) + return being_cooked + +////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// + +/datum/recipe/muffin + reagents = list("milk" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/muffin + +/datum/recipe/muffin/berry + reagents = list("milk" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/berries + ) + result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry + +/datum/recipe/muffin/booberry + reagents = list("milk" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/berries, + /obj/item/weapon/ectoplasm + ) + result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry + +/datum/recipe/muffin/chawanmushi + reagents = list("water" = 5, "soysauce" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi + +////////////////////////////////////////////OTHER//////////////////////////////////////////// + +/datum/recipe/hotdog + reagents = list("ketchup" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/sausage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/hotdog + +/datum/recipe/meatbun + reagents = list("soysauce" = 5, "flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/faggot, + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/meatbun + +/datum/recipe/sugarcookie + reagents = list("flour" = 5, "sugar" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie + +/datum/recipe/fortunecookie + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/paper, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie +/datum/recipe/fortunecookie/make_food(var/obj/container as obj) + var/obj/item/weapon/paper/paper = locate() in container + paper.loc = null //prevent deletion + var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container) + paper.loc = being_cooked + being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn + return being_cooked + +/datum/recipe/poppypretzel + reagents = list("flour" = 5) + items = list( + /obj/item/seeds/poppyseed, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel + +/datum/recipe/plumphelmetbiscuit + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit + +/datum/recipe/appletart + reagents = list("sugar" = 5, "milk" = 5, "flour" = 15) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/appletart + +/datum/recipe/cracker + reagents = list("flour" = 5, "sodiumchloride" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/cracker diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pies.dm b/code/modules/food&drinks/recipes/microwave/recipes_pie.dm similarity index 100% rename from code/modules/food&drinks/recipes/microwave/recipes_pies.dm rename to code/modules/food&drinks/recipes/microwave/recipes_pie.dm diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm b/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm new file mode 100644 index 00000000000..6aee67ae111 --- /dev/null +++ b/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm @@ -0,0 +1,47 @@ + +////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// + +/datum/recipe/pizza/margherita + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita + +/datum/recipe/pizza/meat + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza + +/datum/recipe/pizza/mushroom + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza + +/datum/recipe/pizza/vegetable + reagents = list("flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant, + /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, + /obj/item/weapon/reagent_containers/food/snacks/grown/corn, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza + + diff --git a/code/modules/food&drinks/recipes/microwave/recipes_salad.dm b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm new file mode 100644 index 00000000000..2ad41f702e8 --- /dev/null +++ b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm @@ -0,0 +1,37 @@ +////////////////////////////////////////////////SALADS//////////////////////////////////////////////// + +/datum/recipe/salad/herb + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad + make_food(var/obj/container as obj) + var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container) + being_cooked.reagents.del_reagent("toxin") + return being_cooked + +/datum/recipe/salad/aesir + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad + +/datum/recipe/salad/valid + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, + /obj/item/weapon/reagent_containers/food/snacks/grown/potato, + /obj/item/weapon/reagent_containers/food/snacks/faggot, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/validsalad + make_food(var/obj/container as obj) + var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container) + being_cooked.reagents.del_reagent("toxin") + return being_cooked \ No newline at end of file diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm new file mode 100644 index 00000000000..61dc44b8878 --- /dev/null +++ b/code/modules/holiday/halloween.dm @@ -0,0 +1,306 @@ +//spooky halloween stuff. only tick on halloween!!! + + +//uses super seekrit double proc definition stuffs. remember to call ..()! +/*/mob/dead/observer/say(var/message) //this doesn't actually work vOv + ..() + for(var/mob/M in hearers(src, 1)) + if(!M.stat) + if(M.job == "Chaplain") + if (prob (49)) + M.show_message("You hear muffled speech... but nothing is there...", 2) + if(prob(20)) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) + else + M.show_message("You hear muffled speech... you can almost make out some words...", 2) +// M.show_message("[stutter(message)]", 2) + if(prob(30)) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) + else + if(prob(50)) + return + else if(prob (95)) + M.show_message("You hear muffled speech... but nothing is there...", 2) + if(prob(20)) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) + else + M.show_message("You hear muffled speech... you can almost make out some words...", 2) +// M.show_message("[stutter(message)]", 2) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)*/ + + +/////////////////////////////////////// +///////////HALLOWEEN CONTENT/////////// +/////////////////////////////////////// + + +//spooky recipes + +/datum/recipe/sugarcookie/spookyskull + reagents = list("flour" = 5, "sugar" = 5, "milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookyskull + +/datum/recipe/sugarcookie/spookycoffin + reagents = list("flour" = 5, "sugar" = 5, "coffee" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie/spookycoffin + +////////////////////////////// +//Spookoween trapped closets// +////////////////////////////// + +#define SPOOKY_SKELETON 1 +#define ANGRY_FAITHLESS 2 +#define SCARY_BATS 3 +#define INSANE_CLOWN 4 +#define HOWLING_GHOST 5 + +//Spookoween variables +/obj/structure/closet + var/trapped = 0 + var/mob/trapped_mob + +/obj/structure/closet/initialize() + ..() + if(prob(30)) + set_spooky_trap() + +/obj/structure/closet/dump_contents() + ..() + trigger_spooky_trap() + +/obj/structure/closet/proc/set_spooky_trap() + if(prob(0.1)) + trapped = INSANE_CLOWN + return + if(prob(1)) + trapped = ANGRY_FAITHLESS + return + if(prob(15)) + trapped = SCARY_BATS + return + if(prob(20)) + trapped = HOWLING_GHOST + return + else + var/mob/living/carbon/human/H = new (loc) + H.makeSkeleton() + H.health = 1e5 + insert(H) + trapped_mob = H + trapped = SPOOKY_SKELETON + return + +/obj/structure/closet/proc/trigger_spooky_trap() + if(!trapped) + return + + if(trapped == SPOOKY_SKELETON) + src.visible_message("BOO!"); + playsound(src.loc, pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg','sound/spookoween/girlscream.ogg'), 300, 1) + trapped = 0 + spawn(60) + if(trapped_mob && trapped_mob.loc && trapped_mob.loc != loc) + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new + smoke.set_up(1,0, trapped_mob.loc, 0) + smoke.start() + trapped_mob.loc = loc + if(gc_destroyed) + qdel(trapped_mob) + return + src.close() + trapped = SPOOKY_SKELETON + return + + if(trapped == ANGRY_FAITHLESS) + src.visible_message("The closet bursts open!"); + src.visible_message("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN !!!"); + playsound(src.loc, 'sound/hallucinations/wail.ogg', 300, 1) + var/mob/living/simple_animal/hostile/faithless/F = new (loc) + F.health =1e5 + F.stance = HOSTILE_STANCE_ATTACK + F.GiveTarget(usr) + trapped = 0 + qdel(src) + spawn(120) + if(F && F.loc) + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new + smoke.set_up(1,0, F.loc, 0) + smoke.start() + qdel(F) + return + + if(trapped == SCARY_BATS) + src.visible_message("Protect your hairs !!!"); + playsound(src.loc, 'sound/spookoween/bats.ogg', 300, 1) + var/number = rand(1,4) + for(var/i=0,i < number,i++) + new /mob/living/simple_animal/hostile/retaliate/bat (loc) + trapped = 0 + return + + if(trapped == INSANE_CLOWN) + src.visible_message("..."); + playsound(src.loc, 'sound/spookoween/scary_clown_appear.ogg', 300, 1) + var/mob/living/simple_animal/hostile/retaliate/clown/insane/IC = new (loc) + IC.GiveTarget(usr) + trapped = 0 + return + + if(trapped == HOWLING_GHOST) + src.visible_message("Woo Woo"); + playsound(src.loc, 'sound/spookoween/ghosty_wind.ogg', 300, 1) + new /mob/living/simple_animal/shade/howling_ghost (loc) + trapped = 0 + return + +//don't spawn in crates +/obj/structure/closet/crate/trigger_spooky_trap() + return 0 + +/obj/structure/closet/crate/set_spooky_trap() + return 0 + + +//////////////////// +//Spookoween Ghost// +//////////////////// + +/mob/living/simple_animal/shade/howling_ghost + name ="Ghost" + real_name = "Ghost" + icon = 'icons/mob/mob.dmi' + maxHealth = 1e6 + health = 1e6 + speak_emote = list("howls") + emote_hear = list("wails","screeches") + density = 0 + anchored = 1 + incorporeal_move = 1 + layer = 4 + var/timer = 0 + +/mob/living/simple_animal/shade/howling_ghost/New() + ..() + icon_state = pick("ghost","ghostian","ghostian2","ghostking","ghost1","ghost2") + icon_living = icon_state + status_flags |= GODMODE + timer = rand(1,15) + +/mob/living/simple_animal/shade/howling_ghost/Life() + ..() + timer-- + if(timer == 0) + roam() + spooky_ghosty() + timer = rand(1,15) + +/mob/living/simple_animal/shade/howling_ghost/proc/EtherealMove(direction) + loc = get_step(src, direction) + dir = direction + +/mob/living/simple_animal/shade/howling_ghost/proc/roam() + if(prob(80)) + var/direction = pick(NORTH,SOUTH,EAST,WEST,NORTHEAST,NORTHWEST,SOUTHEAST,SOUTHWEST) + EtherealMove(direction) + +/mob/living/simple_animal/shade/howling_ghost/proc/spooky_ghosty() + if(prob(20)) //haunt + playsound(src.loc, pick('sound/spookoween/ghosty_wind.ogg','sound/spookoween/ghost_whisper.ogg','sound/spookoween/chain_rattling.ogg'), 300, 1) + if(prob(10)) //flickers + var/obj/machinery/light/L = locate(/obj/machinery/light) in view(5, src) + if(L) + L.flicker() + if(prob(5)) //poltergeist + var/obj/item/I = locate(/obj/item) in view(3, src) + if(I) + var/direction = pick(NORTH,SOUTH,EAST,WEST,NORTHEAST,NORTHWEST,SOUTHEAST,SOUTHWEST) + step(I,direction) + return + +/mob/living/simple_animal/shade/howling_ghost/adjustBruteLoss() + return + +/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + return 1 + + +/////////////////////////// +//Spookoween Insane Clown// +/////////////////////////// + +/mob/living/simple_animal/hostile/retaliate/clown/insane + name = "Insane Clown" + desc = "May the HonkMother have mercy..." + icon_state = "scary_clown" + icon_living = "scary_clown" + icon_dead = "scary_clown" + icon_gib = "scary_clown" + speak = list("...", ". . .") + maxHealth = 1e6 + health = 1e6 + emote_see = list("silently stares") + heat_damage_per_tick = 0 + cold_damage_per_tick = 0 + unsuitable_atmos_damage = 0 + + var/timer + +/mob/living/simple_animal/hostile/retaliate/clown/insane/New() + ..() + timer = rand(5,15) + status_flags = (status_flags | GODMODE) + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/Retaliate() + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/ex_act() + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/Life() + timer-- + if(target) + stalk() + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/proc/stalk() + var/mob/living/M = target + if(M.stat == DEAD) + playsound(M.loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) + qdel(src) + if(timer == 0) + timer = rand(5,15) + playsound(M.loc, pick('sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 300, 1) + spawn(12) + loc = M.loc + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/MoveToTarget() + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/AttackTarget() + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/adjustBruteLoss() + if(prob(5)) + playsound(src.loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) + return + +/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(istype(O,/obj/item/weapon/nullrod)) + if(prob(5)) + visible_message("[src] finally found the peace it deserves. HONK for the HonkMother !"); + playsound(src.loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) + qdel(src) + return + else + visible_message("It seems to be resisting the effect!!!"); + return + ..() + diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 3b76c06082c..511c5807572 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -127,6 +127,9 @@ if("void") dat += " Error: No growns inside. "
menustat = "menu"
+ if("nobeakerspace")
+ dat += "Please, put growns into reactor. Not enough space left in container. Unable to create product. "
+ menustat = "menu"
if(beaker)
dat += "Biomass: [points] units. " dat += "ActivateDetach Container" @@ -151,6 +154,7 @@ dat += "Botanical gloves: Make ([250/efficiency]) " dat += "Utility belt: Make ([300/efficiency]) " dat += "Leather Satchel: Make ([400/efficiency]) " + dat += "Leather Jacket: Make ([500/efficiency]) " dat += "" else dat += " No container inside, please insert container. "
@@ -202,13 +206,20 @@
updateUsrDialog()
return 0
+/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount)
+ if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume)
+ menustat = "nobeakerspace"
+ return 1
+
/obj/machinery/biogenerator/proc/create_product(var/create)
switch(create)
if("milk")
- if (check_cost(20/efficiency)) return 0
+ if(check_container_volume(10)) return 0
+ else if (check_cost(20/efficiency)) return 0
else beaker.reagents.add_reagent("milk",10)
if("cream")
- if (check_cost(30/efficiency)) return 0
+ if(check_container_volume(10)) return 0
+ else if (check_cost(30/efficiency)) return 0
else beaker.reagents.add_reagent("cream",10)
if("meat")
if (check_cost(250/efficiency)) return 0
@@ -243,6 +254,9 @@
if("satchel")
if (check_cost(400/efficiency)) return 0
else new/obj/item/weapon/storage/backpack/satchel(src.loc)
+ if("jacket")
+ if (check_cost(500/efficiency)) return 0
+ else new/obj/item/clothing/suit/jacket/leather(src.loc)
//if("monkey")
// if (check_cost(500)) return 0
// else new/mob/living/carbon/monkey(src.loc)
@@ -274,12 +288,11 @@
else if(href_list["create"])
var/amount = (text2num(href_list["amount"]))
var/i = amount
- var/cost = (text2num(href_list["cost"]))
var/C = href_list["create"]
if(i <= 0)
return
while(i >= 1)
- create_product(C, cost, i)
+ create_product(C)
i--
updateUsrDialog()
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index ab5112831d6..1b37c72e8ba 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -736,14 +736,41 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob)
user << "You prepare the astroturf."
- var/location = get_turf(user)
var/grassAmt = 1 + round(potency / 50) // The grass we're holding
- for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/grassToConvert in location) // The grass on the floor
- grassAmt += 1
- qdel(grassToConvert)
- var/obj/item/stack/tile/newAstroturf = new /obj/item/stack/tile/grass(location)
- newAstroturf.amount = grassAmt
+ for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor
+ grassAmt += 1 + round(G.potency / 50)
+ qdel(G)
+ while(grassAmt > 0)
+ var/obj/item/stack/tile/GT = new /obj/item/stack/tile/grass(user.loc)
+ if(grassAmt >= GT.max_amount)
+ GT.amount = GT.max_amount
+ else
+ GT.amount = grassAmt
+ grassAmt -= GT.max_amount
qdel(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/carpet
+ seed = /obj/item/seeds/carpetseed
+ name = "carpet"
+ desc = "The textile industry's dark secret."
+ icon_state = "carpetclump"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user as mob)
+ user << "You roll out the red carpet."
+ var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding
+ for(var/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/C in user.loc) // The carpet on the floor
+ carpetAmt += 1 + round(C.potency / 50)
+ qdel(C)
+ while(carpetAmt > 0)
+ var/obj/item/stack/tile/CT = new /obj/item/stack/tile/carpet(user.loc)
+ if(carpetAmt >= CT.max_amount)
+ CT.amount = CT.max_amount
+ else
+ CT.amount = carpetAmt
+ carpetAmt -= CT.max_amount
+ qdel(src)
+ return
/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod
seed = /obj/item/seeds/kudzuseed
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 3a69a546cb7..def1291608f 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -264,7 +264,14 @@
var/stun = Clamp(potency / 10, 1, 10)
var/weaken = Clamp(potency / 20, 0.5, 5)
M.slip(stun, weaken, src)
+ return 1
+/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
+ name = "synthesized banana peel"
+ desc = "A synthetic banana peel."
+
+/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
+ if(..()) qdel(src)
/obj/item/weapon/grown/corncob
name = "corn cob"
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 44347c4a399..1f34b8fd6d9 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -1013,6 +1013,23 @@
potency = 10
plant_type = 0
growthstages = 2
+ mutatelist = list(/obj/item/seeds/carpetseed)
+
+/obj/item/seeds/carpetseed
+ name = "pack of carpet seeds"
+ desc = "These seeds grow into stylish carpet samples."
+ icon_state = "seed-carpet"
+ species = "carpet"
+ plantname = "Carpet"
+ product = /obj/item/weapon/reagent_containers/food/snacks/grown/carpet
+ lifespan = 40
+ endurance = 40
+ maturation = 2
+ production = 5
+ yield = 5
+ potency = 10
+ plant_type = 0
+ growthstages = 2
/obj/item/seeds/cocoapodseed
name = "pack of cocoa pod seeds"
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index b2d5a0e2183..619279c9034 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -265,6 +265,7 @@
var/obj/item/weapon/storage/book/B = new
B.name = src.name
B.title = src.title
+ B.icon_state = src.icon_state
if(user.l_hand == src || user.r_hand == src)
qdel(src)
user.put_in_hands(B)
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 7cad50f8d9d..0919fe955ac 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -461,14 +461,20 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
icon_state = "binder"
anchored = 1
density = 1
+ var/busy = 0
/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/paper))
+ if(busy)
+ user << "The book binder is busy. Please wait for completion of previous operation."
+ return
user.drop_item()
O.loc = src
user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].")
src.visible_message("[src] begins to hum as it warms up its printing drums.")
+ busy = 1
sleep(rand(200,400))
+ busy = 0
src.visible_message("[src] whirs as it prints and binds a new book.")
var/obj/item/weapon/book/b = new(src.loc)
b.dat = O:info
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index b862a786611..9ee25e2f3db 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -102,7 +102,6 @@
var/obj/item/stack/sheet/s
var/dat
- dat += text("Ore Redemption Machine") dat += text("This machine only accepts ore. Gibtonite and Slag are not accepted. ") dat += text("Current unclaimed points: [points] ") @@ -115,6 +114,8 @@ for(var/O in stack_list) s = stack_list[O] if(s.amount > 0) + if(O == stack_list[1]) + dat += " " //just looks nicer dat += text("[capitalize(s.name)]: [s.amount] Release ") if((/obj/item/stack/sheet/metal in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list)) @@ -123,10 +124,11 @@ if(min(metalstack.amount, plasmastack.amount)) dat += text("Plasteel Alloy (Metal + Plasma): Smelt ") - dat += text(" Mineral Value List: [get_ore_values()]") - - user << browse("[dat]", "window=console_stacking_machine") + dat += text(" Mineral Value List: ")
+ var/datum/browser/popup = new(user, "console_stacking_machine", "Ore Redemption Machine", 400, 500)
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/mineral/ore_redemption/proc/get_ore_values()
@@ -228,19 +230,20 @@
anchored = 1.0
var/obj/item/weapon/card/id/inserted_id
var/list/prize_list = list(
- new /datum/data/mining_equipment("Chili", /obj/item/weapon/reagent_containers/food/snacks/hotchili, 100),
+ new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50),
+ new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine, 50),
+ new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/medipens/utility, 200),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 250),
- new /datum/data/mining_equipment("Stimulant Pills", /obj/item/weapon/storage/pill_bottle/stimulant, 350),
- new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400),
+ new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 300),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 400),
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 450),
new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone/, 500),
+ new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 650),
+ new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 650),
new /datum/data/mining_equipment("Sonic Jackhammer", /obj/item/weapon/pickaxe/jackhammer, 800),
- new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 1000),
- new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000),
new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000),
new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c1000, 5000),
@@ -274,19 +277,20 @@
/obj/machinery/mineral/equipment_vendor/interact(mob/user)
var/dat
- dat += text("Mining Equipment vendor[get_ore_values()] ") - + dat +=" "
if(istype(inserted_id))
dat += "You have [inserted_id.mining_points] mining points collected. Eject ID. " else dat += "No ID inserted. Insert ID. " - - dat += " Equipment point cost list:
" + d += "
|