From 6f5e8e1c1870abd906d014b9ed75d41858c39726 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 7 Jul 2018 16:04:24 -0700 Subject: [PATCH] Fox requests --- code/game/area/Space Station 13 areas.dm | 6 +-- code/game/machinery/computer/depot.dm | 53 +++++++++---------- .../objects/items/devices/radio/beacon.dm | 10 +++- code/game/objects/structures/depot.dm | 11 ++-- .../modules/mob/living/silicon/decoy/decoy.dm | 12 ++--- .../mob/living/simple_animal/bot/medbot.dm | 2 +- .../mob/living/simple_animal/bot/syndicate.dm | 5 +- 7 files changed, 54 insertions(+), 45 deletions(-) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 93a0984393d..23549f935ba 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -629,13 +629,13 @@ var/list/ghostteleportlocs = list() if(on_peaceful) increase_alert("Vandals!") -/area/syndicate_depot/proc/saw_mech(var/obj/mecha/E) +/area/syndicate_depot/proc/saw_mech(obj/mecha/E) if(detected_mech) return detected_mech = TRUE increase_alert("Hostile mecha detected: [E]") -/area/syndicate_depot/proc/peaceful_mode(var/newvalue, var/bycomputer) +/area/syndicate_depot/proc/peaceful_mode(newvalue, bycomputer) if(newvalue) log_game("Depot visit: started") alert_log += "Code GREEN: visitor mode started." @@ -690,7 +690,7 @@ var/list/ghostteleportlocs = list() peaceful_visitors = list() updateicon() -/area/syndicate_depot/proc/local_alarm(var/reason, var/silent) +/area/syndicate_depot/proc/local_alarm(reason, silent) if(local_alarm) return log_game("Depot code: blue: " + list_hostiles()) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 288ea9b0f29..e283f74746c 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -26,7 +26,7 @@ . = ..() depotarea = areaMaster -/obj/machinery/computer/syndicate_depot/attack_ai(var/mob/user) +/obj/machinery/computer/syndicate_depot/attack_ai(mob/user) if(req_access.len && !("syndicate" in user.faction)) to_chat(user, "A firewall blocks your access.") return 1 @@ -35,11 +35,11 @@ /obj/machinery/computer/syndicate_depot/emp_act(severity) return -/obj/machinery/computer/syndicate_depot/emag_act(var/mob/user) +/obj/machinery/computer/syndicate_depot/emag_act(mob/user) to_chat(user, "The electronic systems in this console are far too advanced for your primitive hacking peripherals.") return -/obj/machinery/computer/syndicate_depot/allowed(var/mob/user) +/obj/machinery/computer/syndicate_depot/allowed(mob/user) if(user.can_advanced_admin_interact()) return 1 if(!isliving(user)) @@ -48,7 +48,7 @@ return 0 return ..() -/obj/machinery/computer/syndicate_depot/proc/has_security_lockout(var/mob/user) +/obj/machinery/computer/syndicate_depot/proc/has_security_lockout(mob/user) if(security_lockout) playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0) to_chat(user, "[src] is under security lockout.") @@ -59,7 +59,7 @@ security_lockout = TRUE disable_special_functions() -/obj/machinery/computer/syndicate_depot/attack_hand(var/mob/user as mob) +/obj/machinery/computer/syndicate_depot/attack_hand(mob/user) if(..()) return if(stat & (NOPOWER|BROKEN)) @@ -71,7 +71,6 @@ var/dat = get_menu(user) user << browse(dat, "window=computer;size=575x450") onclose(user, "computer") - return /obj/machinery/computer/syndicate_depot/set_broken() @@ -95,7 +94,6 @@ secondary(usr, text2num(href_list["secondary"])) add_fingerprint(usr) updateUsrDialog() - return /obj/machinery/computer/syndicate_depot/Destroy() disable_special_functions() @@ -104,20 +102,20 @@ return ..() -/obj/machinery/computer/syndicate_depot/proc/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/proc/get_menu(mob/user) return "" -/obj/machinery/computer/syndicate_depot/proc/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/proc/primary(mob/user) if(!allowed(user)) return 1 return 0 -/obj/machinery/computer/syndicate_depot/proc/secondary(var/mob/user, var/subcommand) +/obj/machinery/computer/syndicate_depot/proc/secondary(mob/user, subcommand) if(!allowed(user)) return 1 return 0 -/obj/machinery/computer/syndicate_depot/proc/raise_alert(var/reason) +/obj/machinery/computer/syndicate_depot/proc/raise_alert(reason) if(depotarea) depotarea.increase_alert(reason) @@ -128,20 +126,20 @@ /obj/machinery/computer/syndicate_depot/doors name = "depot door control computer" -/obj/machinery/computer/syndicate_depot/doors/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/doors/get_menu(mob/user) return {"Syndicate Depot Door Control Computer


Toggle Airlock Emergency Access

Toggle Hidden Doors
"} -/obj/machinery/computer/syndicate_depot/doors/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/doors/primary(mob/user) if(..()) return if(depotarea) depotarea.toggle_door_locks(src) to_chat(user, "Door locks toggled.") -/obj/machinery/computer/syndicate_depot/doors/secondary(var/mob/user, var/subcommand) +/obj/machinery/computer/syndicate_depot/doors/secondary(mob/user, subcommand) if(..()) return if(depotarea) @@ -157,7 +155,7 @@ req_access = list() alerts_when_broken = TRUE -/obj/machinery/computer/syndicate_depot/selfdestruct/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/selfdestruct/get_menu(mob/user) var menutext = {"Syndicate Depot Fusion Reactor Control


Disable Containment Field
"} @@ -165,7 +163,7 @@ menutext += {"(ADMIN) Defense Shield: [depotarea.deployed_shields.len ? "ON" : "OFF"] ([depotarea.deployed_shields.len ? "Disable" : "Enable"])
"} return menutext -/obj/machinery/computer/syndicate_depot/selfdestruct/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/selfdestruct/primary(mob/user) if(..()) return if(depotarea.used_self_destruct) @@ -176,7 +174,7 @@ depotarea.activate_self_destruct("Fusion reactor containment field disengaged. All hands, evacuate. All hands, evacuate!", TRUE, user) -/obj/machinery/computer/syndicate_depot/selfdestruct/secondary(var/mob/user) +/obj/machinery/computer/syndicate_depot/selfdestruct/secondary(mob/user) if(..()) return if(!check_rights(R_ADMIN, 0, user)) @@ -203,7 +201,7 @@ if(depotarea) depotarea.comms_computer = src -/obj/machinery/computer/syndicate_depot/syndiecomms/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/syndiecomms/get_menu(mob/user) var/menu = "Syndicate Communications Relay
" menu += "

One-Time Uplink to Syndicate HQ: [message_sent ? "ALREADY USED" : "AVAILABLE (Open Channel)"]" if(depotarea.on_peaceful) @@ -219,7 +217,7 @@ menu += "

Visiting Agents: NONE (Sign-in as Agent)" return menu -/obj/machinery/computer/syndicate_depot/syndiecomms/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/syndiecomms/primary(mob/user) if(..()) return if(!isliving(user)) @@ -243,7 +241,7 @@ raise_alert("Detected unauthorized access by [user] to [src]!") updateUsrDialog() -/obj/machinery/computer/syndicate_depot/syndiecomms/secondary(var/mob/user, var/subcommand) +/obj/machinery/computer/syndicate_depot/syndiecomms/secondary(mob/user, subcommand) if(..()) return if(has_security_lockout(user)) @@ -277,7 +275,7 @@ to_chat(user, "ERROR: [src] is unable to uplink to depot network.") updateUsrDialog() -/obj/machinery/computer/syndicate_depot/syndiecomms/proc/grant_syndie_faction(var/mob/user) +/obj/machinery/computer/syndicate_depot/syndiecomms/proc/grant_syndie_faction(mob/user) user.faction += "syndicate" depotarea.peaceful_visitors += user to_chat(user, {"
Welcome, Agent. @@ -330,6 +328,7 @@ return TRUE for(var/obj/machinery/bluespace_beacon/syndicate/B in myArea) mybeacon = B + B.mycomputer = src return TRUE return FALSE @@ -362,7 +361,7 @@ qdel(myportal) myportal = null -/obj/machinery/computer/syndicate_depot/teleporter/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/teleporter/get_menu(mob/user) var/menutext = "Syndicate Teleporter Control
" findbeacon() if(mybeacon) @@ -374,7 +373,7 @@ menutext += {" ([portal_enabled ? "Disable" : "Enable"])
"} return menutext -/obj/machinery/computer/syndicate_depot/teleporter/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/teleporter/primary(mob/user) if(..()) return if(!mybeacon && user) @@ -384,7 +383,7 @@ to_chat(user, "Syndicate Teleporter Beacon: [bresult ? "ON" : "OFF"]") updateUsrDialog() -/obj/machinery/computer/syndicate_depot/teleporter/secondary(var/mob/user) +/obj/machinery/computer/syndicate_depot/teleporter/secondary(mob/user) if(..()) return if(!check_rights(R_ADMIN, 0, user) && !(depotarea.on_peaceful && !portal_enabled)) @@ -406,7 +405,7 @@ icon_screen = "command" req_access = list() -/obj/machinery/computer/syndicate_depot/aiterminal/get_menu(var/mob/user) +/obj/machinery/computer/syndicate_depot/aiterminal/get_menu(mob/user) var/menutext = "Syndicate AI Terminal

" if(!istype(depotarea)) menutext += "
ERROR: Unable to connect to AI network." @@ -461,7 +460,7 @@ menutext += "

Sentry Bot: (none present)" return menutext -/obj/machinery/computer/syndicate_depot/aiterminal/primary(var/mob/user) +/obj/machinery/computer/syndicate_depot/aiterminal/primary(mob/user) if(..()) return if(!check_rights(R_ADMIN, 0, user)) @@ -470,7 +469,7 @@ depotarea.reset_alert() to_chat(user, "Alert level reset.") -/obj/machinery/computer/syndicate_depot/aiterminal/secondary(var/mob/user) +/obj/machinery/computer/syndicate_depot/aiterminal/secondary(mob/user) if(..()) return for(var/mob/living/simple_animal/bot/ed209/syndicate/B in depotarea.guards_spawned) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 4a5aa2ac1c0..6497edb946d 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -55,8 +55,14 @@ desc = "A label on it reads: Activate to have a singularity beacon teleported to your location." origin_tech = "bluespace=6;syndicate=5" syndicate = 1 + var/obj/machinery/computer/mycomputer -/obj/item/radio/beacon/syndicate/attack_self(mob/user as mob) +/obj/item/radio/beacon/syndicate/Destroy() + if(mycomputer) + mycomputer.mybeacon = null + return ..() + +/obj/item/radio/beacon/syndicate/attack_self(mob/user) if(user) to_chat(user, "Locked In") new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) @@ -69,7 +75,7 @@ desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." origin_tech = "bluespace=5;syndicate=5" -/obj/item/radio/beacon/syndicate/bomb/attack_self(mob/user as mob) +/obj/item/radio/beacon/syndicate/bomb/attack_self(mob/user) if(user) to_chat(user, "Locked In") new /obj/machinery/syndicatebomb( user.loc ) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 5a18c24fd55..5abe238a19c 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -14,11 +14,16 @@ if(depotarea) depotarea.reactor = src +/obj/structure/fusionreactor/Destroy() + if(depotarea) + depotarea.reactor = null + ..() + /obj/structure/fusionreactor/ex_act(severity) obj_integrity -= 10 * severity healthcheck() -/obj/structure/fusionreactor/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/fusionreactor/bullet_act(obj/item/projectile/Proj) obj_integrity -= Proj.damage ..() healthcheck() @@ -39,9 +44,9 @@ for(var/mob/living/M in range(10, loc)) M.apply_effect(rand(5, 25), IRRADIATE) else - return ..(I, user, params) + return ..() -/obj/structure/fusionreactor/proc/overload(var/containment_failure) +/obj/structure/fusionreactor/proc/overload(containment_failure) var/obj/effect/overload/O = new /obj/effect/overload(get_turf(src)) if(containment_failure) playsound(loc, 'sound/machines/Alarm.ogg', 100, 0, 0) diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index ee0d50922fb..b1e5f13f7da 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -12,11 +12,11 @@ src.anchored = 1 src.canmove = 0 -/mob/living/silicon/decoy/attackby(var/obj/item/W, var/mob/user, params) +/mob/living/silicon/decoy/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/aicard)) user.visible_message("[user] cannot find an intellicard slot on [src].") else - return ..(W, user, params) + return ..() /mob/living/silicon/decoy/syndicate faction = list("syndicate") @@ -39,18 +39,18 @@ else say("Connection failure!") -/mob/living/silicon/decoy/syndicate/depot/death(var/pass) +/mob/living/silicon/decoy/syndicate/depot/death(pass) if(!raised_alert) raise_alert() . = ..(pass) -/mob/living/silicon/decoy/syndicate/depot/adjustBruteLoss(var/dmg) +/mob/living/silicon/decoy/syndicate/depot/adjustBruteLoss(dmg) . = ..(dmg) updatehealth() -/mob/living/silicon/decoy/syndicate/depot/adjustFireLoss(var/dmg) +/mob/living/silicon/decoy/syndicate/depot/adjustFireLoss(dmg) . = ..(dmg) updatehealth() -/mob/living/silicon/decoy/syndicate/depot/ex_act(var/severity) +/mob/living/silicon/decoy/syndicate/depot/ex_act(severity) adjustBruteLoss(250) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index d3d48886df8..e3f27d964db 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -78,6 +78,7 @@ name = "Suspicious Medibot" desc = "You'd better have insurance!" skin = "bezerk" + faction = list("syndicate") treatment_oxy = "perfluorodecalin" treatment_brute = "bicaridine" treatment_fire = "kelotane" @@ -91,7 +92,6 @@ /mob/living/simple_animal/bot/medbot/syndicate/New() ..() Radio.syndie = 1 - faction |= "syndicate" /mob/living/simple_animal/bot/medbot/syndicate/emagged emagged = 2 diff --git a/code/modules/mob/living/simple_animal/bot/syndicate.dm b/code/modules/mob/living/simple_animal/bot/syndicate.dm index 86ae4482ce5..34471c3eda3 100644 --- a/code/modules/mob/living/simple_animal/bot/syndicate.dm +++ b/code/modules/mob/living/simple_animal/bot/syndicate.dm @@ -65,7 +65,6 @@ /mob/living/simple_animal/bot/ed209/syndicate/emag_act(mob/user) to_chat(user, "[src] has no card reader slot!") - return /mob/living/simple_animal/bot/ed209/syndicate/ed209_ai() var/turf/current_turf = get_turf(src) @@ -194,7 +193,7 @@ /mob/living/simple_animal/bot/ed209/syndicate/speak() return -/mob/living/simple_animal/bot/ed209/syndicate/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/bot/ed209/syndicate/Process_Spacemove(movement_dir = 0) return 1 /mob/living/simple_animal/bot/ed209/syndicate/start_patrol() @@ -207,7 +206,7 @@ log_debug(failmsg) return ..() -/mob/living/simple_animal/bot/ed209/syndicate/proc/raise_alert(var/reason) +/mob/living/simple_animal/bot/ed209/syndicate/proc/raise_alert(reason) if(raised_alert) return raised_alert = TRUE