+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: []
@@ -143,82 +130,50 @@ Arrest for Unauthorized Weapons: []
Arrest for Warrant: []
Operating Mode: []
-Report Arrests[]"}, - -"[src.idcheck ? "Yes" : "No"]", -"[src.weaponscheck ? "Yes" : "No"]", -"[src.check_records ? "Yes" : "No"]", -"[src.arrest_type ? "Detain" : "Arrest"]", -"[src.declare_arrests ? "Yes" : "No"]" ) - - dat += text({"
-Auto Patrol: []"}, +Report Arrests[]
+Auto Patrol[]"}, +"[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 - src.set_weapon() - 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 - src.set_weapon() - 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" @@ -230,79 +185,75 @@ Auto Patrol: []"}, ..() 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) && (!src.target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + 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.set_weapon() - 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) + 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 threatlevel = C.assess_threat(src, lasercolor) - //src.speak(C.real_name + text(": threat: []", threatlevel)) + //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/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. - src.shootAt(t) + shootAt(t) switch(mode) - if(SECBOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - if(!src.lasercolor) //lasertag bots don't want to arrest anyone + 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(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle - if(src.frustration >= 8) + if (frustration >= 8) walk_to(src,0) back_to_idle() 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 = "[lasercolor]ed209-c" + 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 + 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 @@ -315,45 +266,45 @@ 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.name] 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]!") - 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 he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties 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( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) - src.target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(src.target) + 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 @@ -363,325 +314,78 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.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. + 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 + mode = BOT_PREP_ARREST + anchored = 0 + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() - 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 - 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 /obj/machinery/bot/ed209/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) process() //ensure bot quickly responds /obj/machinery/bot/ed209/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) process() //ensure bot quickly responds -// 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 - - if(lasercolor) - sleep(20) - else - 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/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() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - 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 - 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
" - 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 += "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 +218,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 +239,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) && (W.damtype != STAMINA) ) // 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 + + 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]" /obj/machinery/bot/secbot/process() - set background = BACKGROUND_ENABLED - - if(!src.on) + 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) + 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 + 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) ) M.stuttering = 5 @@ -272,46 +229,46 @@ 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.name] 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]!") - 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 he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if( !src.Adjacent(target) || !isturf(src.target.loc) || src.target.weakened < 2 ) + if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() return if(iscarbon(target) && target.canBeHandcuffed()) - if(!src.arrest_type) - if(!src.target.handcuffed) //he's not cuffed? Try to cuff him! - mode = SECBOT_ARREST - playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) - target.visible_message("[src] is trying to put zipties on [src.target]!",\ - "[src] is trying to put zipties 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( !src.Adjacent(target) || !isturf(src.target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. return - if(!src.target.handcuffed) + if(!target.handcuffed) target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target) target.update_inv_handcuffed(0) //update the handcuffs overlay - 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) + 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() @@ -320,362 +277,95 @@ Auto Patrol: []"}, back_to_idle() return - if(SECBOT_ARREST) - + if(BOT_ARREST) if (!target) - src.anchored = 0 - mode = SECBOT_IDLE - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + last_found = world.time frustration = 0 return - if(src.target.handcuffed) //no target or target cuffed? back to idle. + if(target.handcuffed) //no target or target cuffed? back to idle. back_to_idle() return - if( !src.Adjacent(target) || !isturf(src.target.loc) || (src.target.loc != src.target_lastloc && src.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. + 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() - 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 - 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 /obj/machinery/bot/secbot/proc/back_to_idle() - src.anchored = 0 - mode = SECBOT_IDLE - src.target = null - src.last_found = world.time + anchored = 0 + mode = BOT_IDLE + target = null + last_found = world.time frustration = 0 spawn(0) process() //ensure bot quickly responds /obj/machinery/bot/secbot/proc/back_to_hunt() - src.anchored = 0 - src.frustration = 0 - mode = SECBOT_HUNT + anchored = 0 + frustration = 0 + mode = BOT_HUNT spawn(0) process() //ensure bot quickly responds - -// 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() - if(auto_patrol) - find_patrol_target() - else - mode = SECBOT_IDLE - 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
Engineering Functions
" dat += "- "
dat += "
Power Monitor "
+ if(istype(cartridge.radio, /obj/item/radio/integrated/floorbot))
+ dat += "
Floorbot Access "
dat += "
Medical Functions
" dat += "- "
dat += "
Medical Records "
dat += "
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner "
+ if(istype(cartridge.radio, /obj/item/radio/integrated/medbot))
+ dat += "
Medibot Access "
+ dat += "
Security Functions
" @@ -330,6 +336,8 @@ var/global/list/obj/item/device/pda/PDAs = list() if (cartridge) if (cartridge.access_janitor) dat += "
Custodial Locator
Cleanbot Access
Signaler System" + + 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,55 +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]
" - - for(var/obj/machinery/bot/ed209/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
"
@@ -529,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)
@@ -555,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)" ]
" @@ -644,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/radio.dm b/code/game/objects/items/devices/PDA/radio.dm
index e576cc2e109..ca45bc45567 100644
--- a/code/game/objects/items/devices/PDA/radio.dm
+++ b/code/game/objects/items/devices/PDA/radio.dm
@@ -4,6 +4,13 @@
icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
var/obj/item/device/pda/hostpda = null
+ var/list/botlist = null // list of bots
+ var/obj/machinery/bot/active // the active bot; if null, show bot list
+ var/list/botstatus // the status signal sent by the bot
+ var/bot_type //The type of bot it is.
+ var/bot_filter //Determines which radio filter to use.
+
+ var/control_freq = 1447
var/on = 0 //Are we currently active??
var/menu_message = ""
@@ -12,13 +19,17 @@
..()
if (istype(loc.loc, /obj/item/device/pda))
hostpda = loc.loc
+ if (bot_filter)
+ spawn(5)
+ add_to_radio(bot_filter)
-/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter)
+/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter)
//world << "Post: [freq]: [key]=[value], [key2]=[value2]"
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
- if(!frequency) return
+ if(!frequency)
+ return
var/datum/signal/signal = new()
signal.source = src
@@ -28,6 +39,8 @@
signal.data[key2] = value2
if(key3)
signal.data[key3] = value3
+ if(key4)
+ signal.data[key4] = value4
frequency.post_signal(src, signal, filter = s_filter)
@@ -44,33 +57,18 @@
/obj/item/radio/integrated/proc/generate_menu()
-/obj/item/radio/integrated/beepsky
- var/list/botlist = null // list of bots
- var/obj/machinery/bot/secbot/active // the active bot; if null, show bot list
- var/list/botstatus // the status signal sent by the bot
- var/control_freq = 1447
-// create a new QM cartridge, and register to receive bot control & beacon message
-/obj/item/radio/integrated/beepsky/New()
- ..()
- spawn(5)
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
+/obj/item/radio/integrated/receive_signal(datum/signal/signal)
+ /*var/obj/item/device/pda/P = src.loc
-// receive radio signals
-// can detect bot status signals
-// create/populate list as they are recvd
-/obj/item/radio/integrated/beepsky/receive_signal(datum/signal/signal)
-// var/obj/item/device/pda/P = src.loc
-
- /*
world << "recvd:[P] : [signal.source]"
for(var/d in signal.data)
world << "- [d] = [signal.data[d]]"
- */
- if (signal.data["type"] == "secbot")
+ */
+
+ if (signal.data["type"] == bot_type)
if(!botlist)
botlist = new()
@@ -81,9 +79,7 @@
var/list/b = signal.data
botstatus = b.Copy()
-// if (istype(P)) P.updateSelfDialog()
-
-/obj/item/radio/integrated/beepsky/Topic(href, href_list)
+/obj/item/radio/integrated/Topic(href, href_list)
..()
var/obj/item/device/pda/PDA = src.hostpda
@@ -91,32 +87,53 @@
if("control")
active = locate(href_list["bot"])
- post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
+ post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
if("scanbots") // find all bots
botlist = null
- post_signal(control_freq, "command", "bot_status", s_filter = RADIO_SECBOT)
+ post_signal(control_freq, "command", "bot_status", s_filter = bot_filter)
if("botlist")
active = null
if("stop", "go")
- post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = RADIO_SECBOT)
- post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
+ post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter)
+ post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
if("summon")
- post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , s_filter = RADIO_SECBOT)
- post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
+ post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , "useraccess", PDA.GetAccess(), s_filter = bot_filter)
+ post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
PDA.cartridge.unlock()
+/obj/item/radio/integrated/proc/add_to_radio(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, control_freq, filter = bot_filter)
+
+
+/obj/item/radio/integrated/beepsky
+ bot_filter = RADIO_SECBOT
+ bot_type = SEC_BOT
+
+/obj/item/radio/integrated/medbot
+ bot_filter = RADIO_MEDBOT
+ bot_type = MED_BOT
+
+/obj/item/radio/integrated/floorbot
+ bot_filter = RADIO_FLOORBOT
+ bot_type = FLOOR_BOT
+
+/obj/item/radio/integrated/cleanbot
+ bot_filter = RADIO_CLEANBOT
+ bot_type = CLEAN_BOT
+
/obj/item/radio/integrated/mule
- var/list/botlist = null // list of bots
- var/obj/machinery/bot/mulebot/active // the active bot; if null, show bot list
- var/list/botstatus // the status signal sent by the bot
+ //var/list/botlist = null // list of bots
+ //var/obj/machinery/bot/mulebot/active // the active bot; if null, show bot list
+ //var/list/botstatus // the status signal sent by the bot
var/list/beacons
var/beacon_freq = 1400
- var/control_freq = 1447
+ control_freq = 1447
// create a new QM cartridge, and register to receive bot control & beacon message
/obj/item/radio/integrated/mule/New()
@@ -141,7 +158,7 @@
for(var/d in signal.data)
world << "- [d] = [signal.data[d]]"
*/
- if(signal.data["type"] == "mulebot")
+ if(signal.data["type"] == MULE_BOT)
if(!botlist)
botlist = new()
@@ -162,52 +179,46 @@
// if(istype(P)) P.updateSelfDialog()
/obj/item/radio/integrated/mule/Topic(href, href_list)
- ..()
+ //..()
var/obj/item/device/pda/PDA = src.hostpda
var/cmd = "command"
- if(active) cmd = "command [active.suffix]"
+ if(active)
+ cmd = "command [active.suffix]"
switch(href_list["op"])
if("control")
active = locate(href_list["bot"])
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("scanbots") // find all bots
botlist = null
- post_signal(control_freq, "command", "bot_status", s_filter = RADIO_MULEBOT)
if("botlist")
active = null
-
if("unload")
post_signal(control_freq, cmd, "unload", s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("setdest")
if(beacons)
var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in beacons
if(dest)
post_signal(control_freq, cmd, "target", "destination", dest, s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("retoff")
post_signal(control_freq, cmd, "autoret", "value", 0, s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("reton")
post_signal(control_freq, cmd, "autoret", "value", 1, s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("pickoff")
post_signal(control_freq, cmd, "autopick", "value", 0, s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
+
if("pickon")
post_signal(control_freq, cmd, "autopick", "value", 1, s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
if("stop", "go", "home")
post_signal(control_freq, cmd, href_list["op"], s_filter = RADIO_MULEBOT)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
+
+ post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
PDA.cartridge.unlock()
@@ -227,10 +238,10 @@
..()
if(radio_controller)
initialize()
-
+
/obj/item/radio/integrated/signal/initialize()
if (src.frequency < 1441 || src.frequency > 1489)
- src.frequency = sanitize_frequency(src.frequency)
+ src.frequency = sanitize_frequency(src.frequency)
set_frequency(frequency)
@@ -256,4 +267,4 @@
radio_connection.post_signal(src, signal)
- return
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 38101fedab3..9ab05593915 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -228,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/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 0068304bbcf..5396cdd8940 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -84,7 +84,9 @@
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/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/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index f47d382fe15..f404c37e711 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
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 0e6416867dd..ee907422628 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -156,7 +156,7 @@
name = "janicart"
icon = 'icons/obj/vehicles.dmi'
icon_state = "pussywagon"
- anchored = 1
+ anchored = 0
density = 1
flags = OPENCONTAINER
//copypaste sorry
@@ -206,6 +206,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 +215,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/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index b5e4b9c1f0c..f4a0a0a6ed9 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
@@ -135,13 +158,6 @@
icon_state = "down"
M.pixel_y -= buckled_pixel_y_offset
-/obj/structure/stool/bed/roller/Move()
- ..()
- if(buckled_mob)
- if(buckled_mob.buckled == src)
- buckled_mob.loc = src.loc
- else
- buckled_mob = null
/obj/item/roller
name = "roller bed"
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 8838ba46f78..be89e7e6a5c 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -11,6 +11,10 @@
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))
@@ -30,10 +34,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
@@ -127,11 +131,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/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index ed395cc19e5..9e9afcc61dc 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -55,6 +55,11 @@
for(var/atom/movable/M in src.contents)
M.loc = src.loc
+/obj/structure/transit_tube_pod/Process_Spacemove()
+ if(moving) //No drifting while moving in the tubes
+ return 1
+ else return ..()
+
/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch)
if(moving)
return
@@ -97,7 +102,7 @@
if(current_tube == null)
dir = next_dir
- Move(get_step(loc, dir)) // Allow collisions when leaving the tubes.
+ Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes.
break
last_delay = current_tube.enter_delay(src, next_dir)
@@ -111,22 +116,6 @@
break
density = 1
-
- // If the pod is no longer in a tube, move in a line until stopped or slowed to a halt.
- // /turf/inertial_drift appears to only work on mobs, and re-implementing some of the
- // logic allows a gradual slowdown and eventual stop when passing over non-space turfs.
- if(!current_tube && last_delay <= 10)
- do
- sleep(last_delay)
-
- if(!istype(loc, /turf/space))
- last_delay++
-
- if(last_delay > 10)
- break
-
- while(isturf(loc) && Move(get_step(loc, dir)))
-
moving = 0
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 8e38ac30808..acdb0fab9c4 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -37,18 +37,6 @@
if (istype(A,/mob/living/carbon))
var/mob/living/carbon/M = A
if(M.lying) return
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(istype(H.shoes, /obj/item/clothing/shoes/clown_shoes))
- var/obj/item/clothing/shoes/clown_shoes/O = H.shoes
- if(H.m_intent == "run")
- if(O.footstep >= 2)
- O.footstep = 0
- playsound(src, "clownstep", 50, 1) // this will get annoying very fast.
- else
- O.footstep++
- else
- playsound(src, "clownstep", 20, 1)
switch (src.wet)
if(1) //wet floor
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 13893942dfd..b8ecd518b05 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -52,8 +52,6 @@
if ((!(A) || src != A.loc))
return
- inertial_drift(A)
-
if(transition)
if(destination_x)
@@ -71,8 +69,8 @@
L.pulling.loc = T
//now we're on the new z_level, proceed the space drifting
- if ((A && A.loc))
- A.loc.Entered(A)
+ sleep(0)//Let a diagonal move finish, if necessary
+ A.newtonian_move(A.inertia_dir)
/turf/space/proc/Sandbox_Spacemove(atom/movable/A)
var/cur_x
@@ -211,4 +209,4 @@ proc/setup_map_transitions() //listamania
S.Assign_Destination()
/turf/space/singularity_act()
- return
\ No newline at end of file
+ return
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 4fb55be2ffe..20f53440ed1 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -85,12 +85,7 @@
var/mob/O = M
if(!O.lastarea)
O.lastarea = get_area(O.loc)
- var/has_gravity = O.mob_has_gravity(src)
- O.update_gravity(has_gravity)
- if(!has_gravity)
- inertial_drift(O)
- else if(!istype(src, /turf/space))
- O.inertia_dir = 0
+ O.update_gravity(O.mob_has_gravity())
var/loopsanity = 100
for(var/atom/A in range(1))
@@ -128,25 +123,6 @@
/turf/proc/return_siding_icon_state() //used for grass floors, which have siding.
return 0
-/turf/proc/inertial_drift(atom/movable/A as mob|obj)
- if(!(A.last_move))
- return
- if (A.pulledby)
- return
- if((istype(A, /mob/) && src.x > 2 && src.x < (world.maxx - 1) && src.y > 2 && src.y < (world.maxy-1)))
- var/mob/M = A
- if(M.Process_Spacemove(1))
- M.inertia_dir = 0
- return
- spawn(5)
- if((M && !(M.anchored) && (M.loc == src)))
- if(M.inertia_dir & M.last_move)
- step(M, M.inertia_dir)
- return
- M.inertia_dir = M.last_move
- step(M, M.inertia_dir)
- return
-
/turf/proc/levelupdate()
for(var/obj/O in src)
if(O.level == 1)
diff --git a/code/game/verbs/atom_verbs.dm b/code/game/verbs/atom_verbs.dm
index 2ff6efcf260..2726c11875f 100644
--- a/code/game/verbs/atom_verbs.dm
+++ b/code/game/verbs/atom_verbs.dm
@@ -6,28 +6,3 @@
if(Adjacent(usr))
usr.start_pulling(src)
return
-
-/atom/verb/point()
- set name = "Point To"
- set category = "Object"
- set src in oview()
- var/atom/this = src//detach proc from src
- src = null
-
- if(!usr || !isturf(usr.loc))
- return
- if(usr.stat || usr.restrained())
- return
- if(usr.status_flags & FAKEDEATH)
- return
-
- var/tile = get_turf(this)
- if (!tile)
- return
-
- var/obj/P = new /obj/effect/decal/point(tile)
- spawn (20)
- if(P)
- P.loc = null
-
- usr.visible_message("[usr] points to [this]")
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/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 d40e4a1a1d3..767627aa68a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -784,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)].")
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index e8fa448fce2..bd384c22952 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -259,6 +259,9 @@ var/next_external_rsc = 0
'icons/pda_icons/pda_boom.png',
'icons/pda_icons/pda_bucket.png',
'icons/pda_icons/pda_chatroom.png',
+ 'icons/pda_icons/pda_medbot.png',
+ 'icons/pda_icons/pda_floorbot.png',
+ 'icons/pda_icons/pda_cleanbot.png',
'icons/pda_icons/pda_crate.png',
'icons/pda_icons/pda_cuffs.png',
'icons/pda_icons/pda_eject.png',
@@ -302,4 +305,4 @@ var/next_external_rsc = 0
'icons/stamp_icons/large_stamp-cap.png',
'icons/stamp_icons/large_stamp-qm.png',
'icons/stamp_icons/large_stamp-law.png'
- )
\ No newline at end of file
+ )
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/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/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 8c16e3d746d..496fd90507f 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"
@@ -75,6 +77,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/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 9f569758bae..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
*/
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 5e76a853eac..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"
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/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index ad6a82e04df..bcd9a0ef3bb 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -7,11 +7,35 @@
earliest_start = 0
/datum/round_event/spooky/start()
+ ..()
for(var/mob/living/carbon/human/H in mob_list)
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))
+ spawn_meteors(5, meteorsSPOOKY)
+
+ var/datum/round_event_control/carp_migration/eyeballs/SpookyMigration = locate() in events.control
+ SpookyMigration.runEvent()
+
/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 = 0
+ 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)
+
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/holiday/halloween.dm b/code/modules/holiday/halloween.dm
new file mode 100644
index 00000000000..4e2de9e5c6e
--- /dev/null
+++ b/code/modules/holiday/halloween.dm
@@ -0,0 +1,337 @@
+//spooky halloween stuff. only tick on halloween!!!
+/datum/round_event/spooky/start() //This has to be here because else you get errors with spooky storage not being a defined type.
+ ..()
+ for(var/mob/living/carbon/human/H)
+ for(var/obj/item/weapon/storage/backpack/b in H.contents)
+ new /obj/item/weapon/storage/spooky(b)
+
+//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 foods
+/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 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
+
+//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 6)
+ 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)
+
+//////////////////////////////
+//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.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
+ 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)
+ 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/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 37831db6f0a..c173f406e2f 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -18,29 +18,3 @@
/mob/dead/observer/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq)
src << message
-
-/*
- for (var/mob/M in hearers(null, null))
- 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)
-*/
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index d2845a672ed..9e5285b6cf1 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -158,9 +158,6 @@
/mob/living/carbon/alien/SpeciesCanConsume()
return 1 // Aliens can eat, and they can be fed food/drink
-/mob/living/carbon/alien/Process_Spaceslipping()
- return 0 // Don't slip in space.
-
/mob/living/carbon/alien/Stat()
statpanel("Status")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index dcbcba1ded8..68c63a16410 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -136,7 +136,7 @@
var/atom/step = get_step(src, get_dir(src,target))
if(!step)
break
- src.Move(step)
+ src.Move(step, get_dir(src, step))
hit_check()
error += (error < 0) ? tdist_x : -tdist_y;
dist_travelled++
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 55076006232..52ae23cc879 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -309,20 +309,7 @@
item.layer = initial(item.layer)
src.visible_message("[src] has thrown [item].")
- if(!src.lastarea)
- src.lastarea = get_area(src.loc)
- if(!has_gravity(src))
- src.inertia_dir = get_dir(target, src)
- step(src, inertia_dir)
-
-
-/*
- if(istype(src.loc, /turf/space) || (src.flags & NOGRAV)) //they're in space, move em one space in the opposite direction
- src.inertia_dir = get_dir(target, src)
- step(src, inertia_dir)
-*/
-
-
+ newtonian_move(get_dir(target, src))
item.throw_at(target, item.throw_range, item.throw_speed)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 2d9e34d5519..84d3f094d59 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -43,7 +43,7 @@
return ..()
/mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
- if ((!( yes ) || now_pushing))
+ if ((!( yes ) || now_pushing || buckled))
return
now_pushing = 1
if (ismob(AM))
@@ -111,7 +111,7 @@
if(pulling == AM)
stop_pulling()
var/t = get_dir(src, AM)
- AM.Move(get_step(AM, t))
+ AM.Move(get_step(AM, t), t)
now_pushing = 0
/mob/living/carbon/human/Stat()
@@ -716,4 +716,4 @@
gain = rand(-300, 300)
investigate_log(" has consumed [key_name(src)].","singulo") //Oh that's where the clown ended up!
gib()
- return(gain)
\ No newline at end of file
+ return(gain)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 438fb8c650b..b5ad5610e7e 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -5,40 +5,20 @@
. += ..()
. += config.human_delay
-/mob/living/carbon/human/Process_Spacemove(var/check_drift = 0)
- //Can we act
- if(!canmove) return 0
+/mob/living/carbon/human/Process_Spacemove(var/movement_dir = 0)
+
+ if(..())
+ return 1
//Do we have a working jetpack
- if(istype(back, /obj/item/weapon/tank/jetpack))
+ if(istype(back, /obj/item/weapon/tank/jetpack) && isturf(loc)) //Second check is so you can't use a jetpack in a mech
var/obj/item/weapon/tank/jetpack/J = back
- if(((!check_drift) || (check_drift && J.stabilization_on)) && (!lying) && (J.allow_thrust(0.01, src)))
- inertia_dir = 0
+ if((movement_dir || J.stabilization_on) && J.allow_thrust(0.01, src))
return 1
- //If no working jetpack or magboots then use the other checks
- if(..()) return 1
+
return 0
-/mob/living/carbon/human/Process_Spaceslipping(var/prob_slip = 5)
- //If knocked out we might just hit it and stop. This makes it possible to get dead bodies and such.
- if(stat)
- prob_slip = 0 // Changing this to zero to make it line up with the comment, and also, make more sense.
-
- //Do we have magboots or such on if so no slip
- if(istype(shoes, /obj/item/clothing/shoes/magboots) && (shoes.flags & NOSLIP))
- prob_slip = 0
-
- //Check hands and mod slip
- if(!l_hand) prob_slip -= 2
- else if(l_hand.w_class <= 2) prob_slip -= 1
- if (!r_hand) prob_slip -= 2
- else if(r_hand.w_class <= 2) prob_slip -= 1
-
- prob_slip = round(prob_slip)
- return(prob_slip)
-
-
/mob/living/carbon/human/slip(var/s_amount, var/w_amount, var/obj/O, var/lube)
if(isobj(shoes) && (shoes.flags&NOSLIP) && !(lube&GALOSHES_DONT_HELP))
return 0
@@ -52,3 +32,11 @@
/mob/living/carbon/human/mob_negates_gravity()
return shoes && shoes.negates_gravity()
+
+/mob/living/carbon/human/Move(NewLoc, direct)
+ ..()
+ if(shoes)
+ if(loc == NewLoc)
+ var/obj/item/clothing/shoes/S = shoes
+ S.step_action()
+
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index f6eaebd924c..546384be6c1 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -617,13 +617,24 @@
/datum/species/proc/movement_delay(var/mob/living/carbon/human/H)
var/mspeed = 0
+ if(H.status_flags & GOTTAGOFAST)
+ mspeed -= 1
if(!has_gravity(H))
- return -1 //It's hard to be slowed down in space by... anything
- else if(H.status_flags & GOTTAGOFAST)
- return -1
+ mspeed += 2 //Carefully propelling yourself along the walls is actually quite slow
+
+ if(istype(H.back, /obj/item/weapon/tank/jetpack))
+ var/obj/item/weapon/tank/jetpack/J = H.back
+ if(J.allow_thrust(0.01, H))
+ mspeed -= 3
+
+ if(H.l_hand) //Having your hands full makes movement harder when you're weightless. You try climbing around while holding a gun!
+ mspeed += 0.5
+ if(H.r_hand)
+ mspeed += 0.5
+ if(H.r_hand && H.l_hand)
+ mspeed += 0.5
- mspeed = 0
var/health_deficiency = (100 - H.health + H.staminaloss)
if(health_deficiency >= 40)
mspeed += (health_deficiency / 25)
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index e3e42effb46..99cb7f8eece 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -214,10 +214,7 @@
return 1
/datum/species/fly/handle_speech(message)
- if(copytext(message, 1, 2) != "*")
- message = replacetext(message, "z", stutter("zz"))
-
- return message
+ return replacetext(message, "z", stutter("zz"))
/*
SKELETONS
@@ -229,3 +226,30 @@
id = "skeleton"
sexes = 0
meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton
+/*
+ ZOMBIES
+*/
+
+/datum/species/zombie
+ // 1spooky
+ name = "Brain-Munching Zombie"
+ id = "zombie"
+ say_mod = "moans"
+ sexes = 0
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie
+
+/datum/species/zombie/handle_speech(message)
+ var/list/message_list = text2list(message, " ")
+ var/maxchanges = max(round(message_list.len / 1.5), 2)
+
+ for(var/i = rand(maxchanges / 2, maxchanges), i > 0, i--)
+ var/insertpos = rand(1, message_list.len - 1)
+ var/inserttext = message_list[insertpos]
+
+ if(!(copytext(inserttext, length(inserttext) - 2) == "..."))
+ message_list[insertpos] = inserttext + "..."
+
+ if(prob(20) && message_list.len > 3)
+ message_list.Insert(insertpos, "[pick("BRAINS", "Brains", "Braaaiinnnsss", "BRAAAIIINNSSS")]...")
+
+ return list2text(message_list, " ")
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 3d1a66a3702..3b1095043bc 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -151,7 +151,7 @@
step(AM, t)
now_pushing = null
-/mob/living/carbon/slime/Process_Spacemove()
+/mob/living/carbon/slime/Process_Spacemove(var/movement_dir = 0)
return 2
/mob/living/carbon/slime/Stat()
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 38586236e9a..ed75ad5e894 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -158,19 +158,16 @@
if ("point")
if (!src.restrained())
- var/mob/M = null
+ var/atom/M = null
if (param)
- for (var/atom/A as mob|obj|turf|area in view(1, src))
+ for (var/atom/A as mob|obj|turf in view())
if (param == A.name)
M = A
break
if (!M)
message = "[src] points."
else
- M.point()
- if (M)
- message = "[src] points to [M]."
- else
+ pointed(M)
m_type = 1
if ("scream")
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f38ccd6007b..b29b0885b40 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -315,9 +315,9 @@
return
-/mob/living/Move(a, b, flag)
- if (buckled)
- return
+/mob/living/Move(atom/newloc, direct)
+ if (buckled && buckled.loc != newloc && !buckled.anchored)
+ return buckled.Move(newloc, direct)
if (restrained())
stop_pulling()
@@ -328,7 +328,7 @@
for(var/mob/living/M in range(src, 1))
if ((M.pulling == src && M.stat == 0 && !( M.restrained() )))
t7 = null
- if ((t7 && (pulling && ((get_dist(src, pulling) <= 1 || pulling.loc == loc) && (client && client.moving)))))
+ if (t7 && pulling && (get_dist(src, pulling) <= 1 || pulling.loc == loc))
var/turf/T = loc
. = ..()
@@ -395,12 +395,12 @@
if(check_dna_integrity(M)) //blood DNA
var/mob/living/carbon/DNA_helper = pulling
H.blood_DNA[DNA_helper.dna.unique_enzymes] = DNA_helper.dna.blood_type
- pulling.Move(T)
+ pulling.Move(T, get_dir(pulling, T))
if(M)
M.start_pulling(t)
else
if (pulling)
- pulling.Move(T)
+ pulling.Move(T, get_dir(pulling, T))
else
stop_pulling()
. = ..()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 78489511a0c..e390d9e58c5 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -31,6 +31,7 @@ var/list/ai_list = list()
var/obj/item/device/pda/ai/aiPDA = null
var/obj/item/device/multitool/aiMulti = null
var/obj/item/device/camera/siliconcam/aicamera = null
+ var/obj/machinery/bot/Bot
//MALFUNCTION
var/datum/module_picker/malf_picker
@@ -54,6 +55,8 @@ var/list/ai_list = list()
var/last_paper_seen = null
var/can_shunt = 1
var/last_announcement = "" // For AI VOX, if enabled
+ var/turf/waypoint //Holds the turf of the currently selected waypoint.
+ var/waypoint_mode = 0 //Waypoint mode is for selecting a turf via clicking.
/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
var/list/possibleNames = ai_names
@@ -94,7 +97,7 @@ var/list/ai_list = list()
if (istype(loc, /turf))
verbs.Add(/mob/living/silicon/ai/proc/ai_network_change, \
/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
- /mob/living/silicon/ai/proc/toggle_camera_light)
+ /mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall)
if(!safety)//Only used by AIize() to successfully spawn an AI.
if (!B)//If there is no player/brain inside.
@@ -355,6 +358,24 @@ var/list/ai_list = list()
A.ai_actual_track(target)
return
+ if (href_list["callbot"]) //Command a bot to move to a selected location.
+ Bot = locate(href_list["callbot"]) in machines
+ if(!Bot || Bot.remote_disabled || src.control_disabled)
+ return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off.
+ waypoint_mode = 1
+ src << "Set your waypoint by clicking on a valid location free of obstructions."
+ return
+
+ if (href_list["interface"]) //Remotely connect to a bot!
+ Bot = locate(href_list["interface"]) in machines
+ if(!Bot || Bot.remote_disabled || src.control_disabled)
+ return
+ Bot.attack_ai(src)
+
+ if (href_list["botrefresh"]) //Refreshes the bot control panel.
+ botcall()
+ return
+
else if (href_list["faketrack"])
var/mob/target = locate(href_list["track"]) in mob_list
var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
@@ -449,6 +470,61 @@ var/list/ai_list = list()
return 1
+/mob/living/silicon/ai/proc/botcall()
+ set category = "AI Commands"
+ set name = "Access Robot Control"
+ set desc = "Wirelessly control various automatic robots."
+ if(stat == 2)
+ src << "Critical error. System offline."
+ return
+
+ if(control_disabled)
+ src << "Wireless communication is disabled."
+ return
+ var/turf/ai_current_turf = get_turf(src)
+ var/ai_Zlevel = ai_current_turf.z
+ var/d
+ var/area/bot_area
+ d += "Query network status" + d += "
Name | Status | Location | Control | |
| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] | " + //If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all. + d += "[Bot.on ? "[Bot.mode ? "[ Bot.mode_name[Bot.mode] ]": "Idle"]" : "Inactive"] | " + d += "[bot_area.name] | " + d += "Interface | " + d += "Call | " + d += "