From 0524045befb7bf9de3eed7bd0054741ef8a8988e Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 11 Nov 2015 23:18:56 +0100 Subject: [PATCH 1/7] Removes gun turrets --- code/game/gamemodes/handofgod/structures.dm | 63 ++--- code/game/machinery/portable_turret.dm | 258 ++++++++------------ code/game/machinery/turrets.dm | 158 ------------ icons/obj/turrets.dmi | Bin 54854 -> 54872 bytes tgstation.dme | 1 - 5 files changed, 134 insertions(+), 346 deletions(-) delete mode 100644 code/game/machinery/turrets.dm diff --git a/code/game/gamemodes/handofgod/structures.dm b/code/game/gamemodes/handofgod/structures.dm index ed4264e5fe6..9ba634ca0f0 100644 --- a/code/game/gamemodes/handofgod/structures.dm +++ b/code/game/gamemodes/handofgod/structures.dm @@ -444,12 +444,12 @@ maxhealth = 150 metal_cost = 25 glass_cost = 30 - var/obj/machinery/gun_turret/defensepylon_internal_turret/pylon_gun + var/obj/machinery/porta_turret/defensepylon_internal_turret/pylon_gun /obj/structure/divine/defensepylon/New() ..() - pylon_gun = new() + pylon_gun = new(src) pylon_gun.base = src pylon_gun.faction = list("[side] god") @@ -474,49 +474,50 @@ pylon_gun.on = !pylon_gun.on icon_state = (pylon_gun.on) ? "defensepylon-[side]" : "defensepylon" - //This sits inside the defensepylon, to avoid copypasta -/obj/machinery/gun_turret/defensepylon_internal_turret +/obj/machinery/porta_turret/defensepylon_internal_turret name = "defense pylon" desc = "A plyon which is blessed to withstand many blows, and fire strong bolts at nonbelievers." icon = 'icons/obj/hand_of_god_structures.dmi' - icon_state = "defensepylon" + installation = null + always_up = 1 + use_power = 0 + has_cover = 0 health = 200 + projectile = /obj/item/projectile/beam/pylon_bolt + eprojectile = /obj/item/projectile/beam/pylon_bolt + shot_sound = 'sound/weapons/emitter2.ogg' + eshot_sound = 'sound/weapons/emitter2.ogg' base_icon_state = "defensepylon" - scan_range = 7 + active_state = "" + off_state = "" faction = null - projectile_type = /obj/item/projectile/beam/pylon_bolt - fire_sound = 'sound/weapons/emitter2.ogg' var/side = "neutral" - var/on = 1 -/obj/machinery/gun_turret/defensepylon_internal_turret/process() - if(on) - ..() +/obj/machinery/porta_turret/defensepylon_internal_turret/setup() + return -/obj/machinery/gun_turret/defensepylon_internal_turret/fire(atom/target) +/obj/machinery/porta_turret/defensepylon_internal_turret/shootAt(atom/movable/target) var/obj/item/projectile/A = ..() if(A) A.color = side -/obj/machinery/gun_turret/defensepylon_internal_turret/validate_target(atom/target) - . = ..() - if(.) - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(H.handcuffed) //dishonourable to kill somebody who might be converted. - return 0 - - var/badtarget = 0 - switch(side) - if("blue") - badtarget = is_handofgod_bluecultist(target) - if("red") - badtarget = is_handofgod_redcultist(target) - else - badtarget = 1 - if(badtarget) - return 0 +/obj/machinery/porta_turret/defensepylon_internal_turret/assess_perp(mob/living/carbon/human/perp) += + if(H.handcuffed) //dishonourable to kill somebody who might be converted. + return 0 + var/badtarget = 0 + switch(side) + if("blue") + badtarget = is_handofgod_bluecultist(perp) + if("red") + badtarget = is_handofgod_redcultist(perp) + else + badtarget = 1 + if(badtarget) + return 0 + return 10 + /obj/item/projectile/beam/pylon_bolt diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 31929f6e94f..c81bfdf5c26 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -17,6 +17,13 @@ req_access = list(access_security) power_channel = EQUIP //drains power from the EQUIPMENT channel + var/base_icon_state = "grey" + var/active_state = "Taser" // "Taser"/"Laser/"Bullet" ,blue/red/no glow on active turret + var/off_state = "Off" + + var/scan_range = 7 + var/atom/base = null //for turrets inside other objects + var/lasercolor = "" //Something to do with lasertag turrets, blame Sieve for not adding a comment. var/raised = 0 //if the turret cover is "open" and the turret is raised var/raising= 0 //if the turret is currently opening or closing its cover @@ -29,8 +36,9 @@ var/projectile = null //holder for bullettype var/eprojectile = null //holder for the shot when emagged var/reqpower = 500 //holder for power needed - var/iconholder = null //holder for the icon_state. 1 for orange sprite, null for blue. var/egun = null //holder to handle certain guns switching bullettypes + var/always_up = 0 //Will stay active + var/has_cover = 1 //Hides the cover var/obj/machinery/porta_turret_cover/cover = null //the cover that is covering this turret var/last_fired = 0 //1: if the turret is cooling down from a shot, 0: turret is ready to fire @@ -57,19 +65,35 @@ /obj/machinery/porta_turret/New() ..() - icon_state = "[lasercolor]grey_target_prism" + if(!base) + base = src + icon_state = "[base_icon_state][off_state]" //Sets up a spark system spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) - cover = new /obj/machinery/porta_turret_cover(loc) - cover.Parent_Turret = src + if(has_cover) + cover = new /obj/machinery/porta_turret_cover(loc) + cover.Parent_Turret = src setup() + if(!has_cover) + popUp() + + +/obj/machinery/porta_turret/proc/get_base_icon() + if(installation) + switch(installation) + if(/obj/item/weapon/gun/energy/laser/bluetag) + return "blue" + if(/obj/item/weapon/gun/energy/laser/redtag) + return "red" + return "grey" + /obj/machinery/porta_turret/proc/setup() - var/obj/item/weapon/gun/energy/E=new installation //All energy-based weapons are applicable + var/obj/item/weapon/gun/energy/E= new installation //All energy-based weapons are applicable var/obj/item/ammo_casing/shottype = E.ammo_type[1] projectile = shottype.projectile_type @@ -99,27 +123,20 @@ stun_all = 0 check_anomalies = 0 shot_delay = 30 - iconholder = 1 + active_state = "Laser" if(/obj/item/weapon/gun/energy/laser/practice) - iconholder = 1 + active_state = "Laser" eprojectile = /obj/item/projectile/beam -// if(/obj/item/weapon/gun/energy/laser/practice/sc_laser) -// iconholder = 1 -// eprojectile = /obj/item/projectile/beam - if(/obj/item/weapon/gun/energy/laser/retro) - iconholder = 1 - -// if(/obj/item/weapon/gun/energy/laser/retro/sc_retro) -// iconholder = 1 + active_state = "Laser" if(/obj/item/weapon/gun/energy/laser/captain) - iconholder = 1 + active_state = "Laser" if(/obj/item/weapon/gun/energy/lasercannon) - iconholder = 1 + active_state = "Laser" if(/obj/item/weapon/gun/energy/gun/advtaser) eprojectile = /obj/item/projectile/beam @@ -140,6 +157,8 @@ eshot_sound = 'sound/weapons/Laser.ogg' egun = 1 + base_icon_state = get_base_icon() + /obj/machinery/porta_turret/Destroy() //deletes its own cover with it qdel(cover) @@ -229,22 +248,17 @@ icon_state = "turretCover" return if(stat & BROKEN) - icon_state = "[lasercolor]destroyed_target_prism" + icon_state = "[base_icon_state]Broken" else if( powered() ) if(on) - if(iconholder) - //lasers have a orange icon - icon_state = "[lasercolor]orange_target_prism" - else - //almost everything has a blue icon - icon_state = "[lasercolor]target_prism" + icon_state = "[base_icon_state][active_state]" else - icon_state = "[lasercolor]grey_target_prism" + icon_state = "[base_icon_state][off_state]" stat &= ~NOPOWER else spawn(rand(0, 15)) - icon_state = "[lasercolor]grey_target_prism" + icon_state = "[base_icon_state][off_state]" stat |= NOPOWER @@ -277,10 +291,11 @@ if(!anchored && !isinspace()) anchored = 1 invisibility = INVISIBILITY_LEVEL_TWO - icon_state = "[lasercolor]grey_target_prism" + icon_state = "[base_icon_state][off_state]" user << "You secure the exterior bolts on the turret." - cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second - cover.Parent_Turret = src //make the cover's parent src + if(has_cover) + cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second + cover.Parent_Turret = src //make the cover's parent src else if(anchored) anchored = 0 user << "You unsecure the exterior bolts on the turret." @@ -339,7 +354,7 @@ user << "You short out [src]'s threat assessment circuits." visible_message("[src] hums oddly...") emagged = 1 - iconholder = 1 + active_state = "Laser" controllock = 1 on = 0 //turns off the turret temporarily sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit @@ -412,7 +427,7 @@ health = 0 density = 0 stat |= BROKEN //enables the BROKEN bit - icon_state = "[lasercolor]destroyed_target_prism" + icon_state = "[base_icon_state]Broken" invisibility = 0 spark_system.start() //creates some sparks because they look cool density = 1 @@ -429,22 +444,22 @@ if(stat & BROKEN) //if the turret is borked qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else + if(has_cover) + cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover + cover.Parent_Turret = src //assign the cover its Parent_Turret, which would be this (src) - cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover - cover.Parent_Turret = src //assign the cover its Parent_Turret, which would be this (src) - - if(stat & (NOPOWER|BROKEN)) + if(stat & (NOPOWER|BROKEN) && !always_up) //if the turret has no power or is broken, make the turret pop down if it hasn't already popDown() return - if(!on) + if(!on && !always_up) //if the turret is off, make it pop down popDown() return var/list/targets = list() //list of primary targets - var/turretview = view(7, src) + var/turretview = view(scan_range, base) if(check_anomalies) //if it's set to check for xenos/simpleanimals for(var/mob/living/simple_animal/SA in turretview) @@ -476,12 +491,13 @@ for(var/obj/mecha/M in turretview) if(M.occupant) - if(ai || emagged) // we target all occupied mechs if we're emagged or set to attack all non silicons. + if(ai || emagged || assess_perp(M.occupant) >= 4) // we target all occupied mechs if we're emagged or set to attack all non silicons. targets += M if(!tryToShootAt(targets)) - spawn() - popDown() // no valid targets, close the cover + if(!always_up) + spawn() + popDown() // no valid targets, close the cover /obj/machinery/porta_turret/proc/tryToShootAt(list/atom/movable/targets) @@ -501,10 +517,12 @@ return invisibility = 0 raising = 1 - flick("popup", cover) + if(cover) + flick("popup", cover) sleep(10) raising = 0 - cover.icon_state = "openTurretCover" + if(cover) + cover.icon_state = "openTurretCover" raised = 1 layer = 4 @@ -517,13 +535,15 @@ return layer = 3 raising = 1 - flick("popdown", cover) + if(cover) + flick("popdown", cover) sleep(10) raising = 0 - cover.icon_state = "turretCover" + if(cover) + cover.icon_state = "turretCover" raised = 0 invisibility = 2 - icon_state = "[lasercolor]grey_target_prism" + icon_state = "[base_icon_state][off_state]" /obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/perp) @@ -585,7 +605,7 @@ if(target) spawn() popUp() //pop the turret up if it's not already up. - dir = get_dir(src, target) //even if you can't shoot, follow the target + dir = get_dir(base, target) //even if you can't shoot, follow the target spawn() shootAt(target) return 1 @@ -609,34 +629,34 @@ return //any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power! - if(iconholder) - icon_state = "[lasercolor]orange_target_prism" - else - icon_state = "[lasercolor]target_prism" + icon_state = "[base_icon_state][active_state]" var/obj/item/projectile/A if(emagged) - A = new eprojectile(loc) + A = new eprojectile(T) playsound(loc, eshot_sound, 75, 1) else - A = new projectile(loc) + A = new projectile(T) playsound(loc, shot_sound, 75, 1) A.original = target if(!emagged) use_power(reqpower) else use_power(reqpower * 2) - //Shooting Code: + //Shooting Code: A.current = T A.yo = U.y - T.y A.xo = U.x - T.x A.fire() + return A + /obj/machinery/porta_turret/proc/setState(on, emagged) if(controllock) return src.on = on src.emagged = emagged - src.iconholder = emagged + if(emagged) + src.active_state = "Laser" src.power_change() /* @@ -867,113 +887,16 @@ . = ..() if(.) return - var/dat - if(!(Parent_Turret.lasercolor)) - dat += text({" -Automatic Portable Turret Installation

-Status: []
-Behaviour controls are [Parent_Turret.locked ? "locked" : "unlocked"]"}, - -"[Parent_Turret.on ? "On" : "Off"]" ) - - - dat += text({"
-Check for Weapon Authorization: []
-Check Security Records: []
-Neutralize Identified Criminals: []
-Neutralize All Non-Security and Non-Command Personnel: []
-Neutralize All Unidentified Life Signs: []
"}, - -"[Parent_Turret.auth_weapons ? "Yes" : "No"]", -"[Parent_Turret.check_records ? "Yes" : "No"]", -"[Parent_Turret.criminals ? "Yes" : "No"]", -"[Parent_Turret.stun_all ? "Yes" : "No"]" , -"[Parent_Turret.check_anomalies ? "Yes" : "No"]" ) - else - dat += text({" -Automatic Portable Turret Installation

-Status: []
"}, - -"[Parent_Turret.on ? "On" : "Off"]" ) - - user << browse("Automatic Portable Turret Installation[dat]", "window=autosec") - onclose(user, "autosec") + + return Parent_Turret.attack_ai(user) /obj/machinery/porta_turret_cover/attack_hand(mob/user) . = ..() if(.) return - var/dat - if(!Parent_Turret.lasercolor) - dat += text({" - Automatic Portable Turret Installation

- Status: []
- Behaviour controls are [Parent_Turret.locked ? "locked" : "unlocked"]"}, - "[Parent_Turret.on ? "On" : "Off"]" ) - - if(!Parent_Turret.locked) - dat += text({"
- Check for Weapon Authorization: []
- Check Security Records: []
- Neutralize Identified Criminals: []
- Neutralize All Non-Security and Non-Command Personnel: []
- Neutralize All Unidentified Life Signs: []
"}, - - "[Parent_Turret.auth_weapons ? "Yes" : "No"]", - "[Parent_Turret.check_records ? "Yes" : "No"]", - "[Parent_Turret.criminals ? "Yes" : "No"]", - "[Parent_Turret.stun_all ? "Yes" : "No"]" , - "[Parent_Turret.check_anomalies ? "Yes" : "No"]" ) - else - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - if(Parent_Turret.lasercolor == "b" && istype(H.wear_suit, /obj/item/clothing/suit/redtag)) - return - if(Parent_Turret.lasercolor == "r" && istype(H.wear_suit, /obj/item/clothing/suit/bluetag)) - return - dat += text({" - Automatic Portable Turret Installation

- Status: []
"}, - - "[Parent_Turret.on ? "On" : "Off"]" ) - - user << browse("Automatic Portable Turret Installation[dat]", "window=autosec") - onclose(user, "autosec") - - -/obj/machinery/porta_turret_cover/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - Parent_Turret.add_fingerprint(usr) - add_fingerprint(usr) - if(href_list["power"] && !Parent_Turret.locked) - if(Parent_Turret.anchored) - if(Parent_Turret.on) - Parent_Turret.on = 0 - else - Parent_Turret.on = 1 - else - usr << "It has to be secured first!" - - updateUsrDialog() - return - - switch(href_list["operation"]) - if("authweapon") - Parent_Turret.auth_weapons = !Parent_Turret.auth_weapons - if("checkrecords") - Parent_Turret.check_records = !Parent_Turret.check_records - if("shootcrooks") - Parent_Turret.criminals = !Parent_Turret.criminals - if("shootall") - Parent_Turret.stun_all = !Parent_Turret.stun_all - if("checkxenos") - Parent_Turret.check_anomalies = !Parent_Turret.check_anomalies - - updateUsrDialog() + return Parent_Turret.attack_hand(user) /obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user, params) @@ -1014,7 +937,7 @@ Status: []
"}, ..() /obj/machinery/porta_turret_cover/emag_act(mob/user) - if(!emagged) + if(!Parent_Turret.emagged) user << "You short out [Parent_Turret]'s threat assessment circuits." visible_message("[Parent_Turret] hums oddly...") Parent_Turret.emagged = 1 @@ -1025,10 +948,33 @@ Status: []
"}, /obj/machinery/porta_turret/stationary emagged = 1 - New() +/obj/machinery/porta_turret/stationary/New() installation = new/obj/item/weapon/gun/energy/laser(loc) ..() + +/obj/machinery/porta_turret/syndicate + installation = null + always_up = 1 + use_power = 0 + has_cover = 0 + scan_range = 9 + projectile = /obj/item/projectile/bullet + eprojectile = /obj/item/projectile/bullet + shot_sound = 'sound/weapons/Gunshot.ogg' + eshot_sound = 'sound/weapons/Gunshot.ogg' + base_icon_state = "syndie" + active_state = "Bullet" + faction = "syndicate" + +/obj/machinery/porta_turret/syndicate/setup() + return + +/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp) + if(faction in perp.faction) //Shoot all non syndies + return 0 + return 10 + //////////////////////// //Turret Control Panel// //////////////////////// diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm deleted file mode 100644 index 188f7e9c3be..00000000000 --- a/code/game/machinery/turrets.dm +++ /dev/null @@ -1,158 +0,0 @@ -////////////// -//Gun Turret// -////////////// - -/obj/machinery/gun_turret //related to turrets but work way differentely because of being mounted on a moving ship. - name = "machine gun turret" - desc = "Syndicate defense turret. It really packs a punch." - density = 1 - anchored = 1 - var/state = 0 //Like stat on mobs, 0 is alive, 1 is damaged, 2 is dead - var/faction = "syndicate" - var/atom/cur_target = null - var/scan_range = 9 //You will never see them coming - var/health = 200 //Because it lacks a cover, and is mostly to keep people from touching the syndie shuttle. - var/base_icon_state = "syndieturret" - var/projectile_type = /obj/item/projectile/bullet - var/fire_sound = 'sound/weapons/Gunshot.ogg' - var/atom/base = null //where do to range calculations, firing projectiles, etc. from. allows for turrets inside of things to work - icon = 'icons/obj/turrets.dmi' - icon_state = "syndieturret0" - -/obj/machinery/gun_turret/New() - ..() - if(!base) - base = src - take_damage(0) //check your health - icon_state = "[base_icon_state]" + "0" - - -/obj/machinery/gun_turret/ex_act(severity, target) - switch(severity) - if(1) - die() - if(2) - take_damage(100) - if(3) - take_damage(50) - return - -/obj/machinery/gun_turret/emp_act() //Can't emp an mechanical turret. - return - -/obj/machinery/gun_turret/update_icon() - if(state > 2 || state < 0) //someone fucked up the vars so fix them - take_damage(0) - icon_state = "[base_icon_state]" + "[state]" - return - - -/obj/machinery/gun_turret/proc/take_damage(damage) - health -= damage - switch(health) - if(101 to INFINITY) - state = 0 - if(1 to 100) - state = 1 - if(-INFINITY to 0) - if(state != 2) - die() - return - state = 2 - - update_icon() - return - - -/obj/machinery/gun_turret/bullet_act(obj/item/projectile/Proj) - take_damage(Proj.damage) - return - -/obj/machinery/gun_turret/proc/die() - state = 2 - update_icon() - -/obj/machinery/gun_turret/attack_hand(mob/user) - return - -/obj/machinery/gun_turret/attack_ai(mob/user) - return attack_hand(user) - - -/obj/machinery/gun_turret/attack_alien(mob/living/user) - user.changeNext_move(CLICK_CD_MELEE) - user.do_attack_animation(src) - user.visible_message("[user] slashes at [src]!", "You slash at [src]!") - take_damage(15) - return - - -/obj/machinery/gun_turret/proc/should_target(atom/target) - if(ismob(target)) - var/mob/M = target - if(!M.stat && !(faction in M.faction)) - return 1 - else if(istype(target, /obj/mecha)) - var/obj/mecha/M = target - if(M.occupant && should_target(M.occupant)) - return 1 - return 0 - - -/obj/machinery/gun_turret/proc/validate_target(atom/target) - if(get_dist(target, base)>scan_range) - return 0 - if(should_target(target)) - return 1 - return 0 - - -/obj/machinery/gun_turret/process() - if(state == 2) - return - if(cur_target && !validate_target(cur_target)) - cur_target = null - if(!cur_target) - cur_target = get_target() - if(cur_target) - fire(cur_target) - return - - -/obj/machinery/gun_turret/proc/get_target() - var/list/pos_targets = list() - var/target = null - for(var/mob/living/M in view(scan_range,base)) - if(!should_target(M)) - continue - pos_targets += M - for(var/obj/mecha/M in oview(scan_range, base)) - if(!should_target(M)) - continue - pos_targets += M - if(pos_targets.len) - target = pick(pos_targets) - return target - - -/obj/machinery/gun_turret/proc/fire(atom/target) - if(!target) - cur_target = null - return - src.dir = get_dir(base,target) - var/turf/targloc = get_turf(target) - if(!src) - return - var/turf/curloc = get_turf(base) - if (!targloc || !curloc) - return - if (targloc == curloc) - return - playsound(src, fire_sound, 50, 1) - var/obj/item/projectile/A = new projectile_type(curloc) - A.current = curloc - A.yo = targloc.y - curloc.y - A.xo = targloc.x - curloc.x - A.fire() - return - diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi index fa8dad72c363467d09b5fefc48d12024d6a58c65..88dbac9382957347e94a81d3bec74fb42c08466d 100644 GIT binary patch delta 367 zcmV-#0g(R2tOMAr1CS(tR(e!ebVOxyV{&P5bZKvH004NLt&~k~f5@J})MNnc@l&*cTE_DboObWv0BhM!ykQG^o;Y9?0Ii)AG5JT8;wW)pG zQDL77MIce74a5*W-FZZyjH$2tIZuS{)tr$Ax^}FoQ6GQ7*QS={qW{shAZ*rTK2eV@ zsvvBRsqJe%Am3S}L#xvH=-dviN<$vDxQ|7>SGv$#fnJJGv%S?IXY1&51iY3~TYp+!Q7CeS;=DI%3DQpiL*z9-W3piN9 NO_Wq~0<&=e)zpLvv4H>p delta 349 zcmV-j0iyoctOLfZ1CS(tM0!+MbVOxyV{&P5bZKvH004NLt(3uP!!Qhn&+$`;_Buw> zCS@02x|Y#Hd)nPNSWN9&N#VfbYDB>nm=c@2lt$N37!%bDGgTxm3L zNM1KAdX&l+z+ty#QGsP%`0nDo^avbQIbkcjq#V7lRJwY_B2|)q0}gL2x{<8W0f)Gc zu*NpFr{ZTSW|6{5w!k5N88|GejIlrS`GyGnySXEcWbIjFQGW*T)>vg8`XALQbe>F$ zD$KMX*pSpY1{Oe9$?c>e9$h8ldDw0kOP^dzzpeTeDrQPaXJT{nCCfGM#b#cOz0jsM zcbrR)*qshc-=Ek|>9+Gmi*AK_G#Sy;5TO@0lJ%(g(FN_oru9(xk3tKVio)n6Yn6p} vlP&Bf3!|5G<65ms?A~(|M8`q&=#;GCbUniHa%Nv20r$22I3bL)g8|jloQJOh diff --git a/tgstation.dme b/tgstation.dme index c8e8d14641e..128acf25a6c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -450,7 +450,6 @@ #include "code\game\machinery\syndicatebomb.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transformer.dm" -#include "code\game\machinery\turrets.dm" #include "code\game\machinery\vending.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\wishgranter.dm" From c9dc0b7998e04635a75fd7ca7dd7764bbfeb2a20 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 15 Nov 2015 14:52:31 +0100 Subject: [PATCH 2/7] Makes turret control panels buildable --- code/game/machinery/portable_turret.dm | 17 +++++++++++++++-- .../research/designs/autolathe_designs.dm | 8 ++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index c81bfdf5c26..38c5b09d361 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -993,7 +993,7 @@ var/ailock = 0 // AI cannot use this req_access = list(access_ai_upload) -/obj/machinery/turretid/New() +/obj/machinery/turretid/New(loc, ndir = 0, built = 0) ..() if(!control_area) var/area/CA = get_area(src) @@ -1006,6 +1006,11 @@ if(A.name && A.name==control_area) control_area = A break + if(built) + dir = ndir + locked = 0 + pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) + pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 power_change() //Checks power and initial settings //don't have to check if control_area is path, since get_area_all_atoms can take path. return @@ -1121,4 +1126,12 @@ else icon_state = "control_stun" else - icon_state = "control_standby" \ No newline at end of file + icon_state = "control_standby" + +/obj/item/wallframe/turret_control + name = "turret control frame" + desc = "Used for building turret control panels" + icon = 'icons/obj/apc_repair.dmi' + icon_state = "apc_frame" + result_path = /obj/machinery/turretid + materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) \ No newline at end of file diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 0ed1120d503..23954283fd6 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -578,3 +578,11 @@ materials = list(MAT_METAL = 150, MAT_GLASS = 150) build_path = /obj/item/device/geiger_counter category = list("initial", "Tools") + +/datum/design/turret_control_frame + name = "Turret control frame" + id = "turret_control" + build_type = AUTOLATHE + materials = list(MAT_METAL = 12000) + build_path = /obj/item/wallframe/turret_control + category = list("initial", "Construction") \ No newline at end of file From 48533846cd33ea263df0f24f03ac11ee5aaa47d2 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 15 Nov 2015 15:09:14 +0100 Subject: [PATCH 3/7] typo fix --- code/game/gamemodes/handofgod/structures.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/gamemodes/handofgod/structures.dm b/code/game/gamemodes/handofgod/structures.dm index 9ba634ca0f0..c10ef417533 100644 --- a/code/game/gamemodes/handofgod/structures.dm +++ b/code/game/gamemodes/handofgod/structures.dm @@ -503,8 +503,7 @@ A.color = side /obj/machinery/porta_turret/defensepylon_internal_turret/assess_perp(mob/living/carbon/human/perp) -= - if(H.handcuffed) //dishonourable to kill somebody who might be converted. + if(perp.handcuffed) //dishonourable to kill somebody who might be converted. return 0 var/badtarget = 0 switch(side) From 6c2cb63ff078fdcfbb51f009d567d41ad35fd066 Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 16 Nov 2015 20:14:00 +0100 Subject: [PATCH 4/7] Makes syndie/hog turrets ignore emp --- code/game/gamemodes/handofgod/structures.dm | 1 + code/game/machinery/portable_turret.dm | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/handofgod/structures.dm b/code/game/gamemodes/handofgod/structures.dm index c10ef417533..9564bd75fd0 100644 --- a/code/game/gamemodes/handofgod/structures.dm +++ b/code/game/gamemodes/handofgod/structures.dm @@ -492,6 +492,7 @@ active_state = "" off_state = "" faction = null + emp_vunerable = 0 var/side = "neutral" /obj/machinery/porta_turret/defensepylon_internal_turret/setup() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 38c5b09d361..6043a7d3055 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -21,6 +21,8 @@ var/active_state = "Taser" // "Taser"/"Laser/"Bullet" ,blue/red/no glow on active turret var/off_state = "Off" + var/emp_vunerable = 1 // Can be empd + var/scan_range = 7 var/atom/base = null //for turrets inside other objects @@ -394,7 +396,7 @@ /obj/machinery/porta_turret/emp_act(severity) - if(on) + if(on && emp_vunerable) //if the turret is on, the EMP no matter how severe disables the turret for a while //and scrambles its settings, with a slight chance of having an emag effect check_records = pick(0, 1) @@ -966,6 +968,7 @@ base_icon_state = "syndie" active_state = "Bullet" faction = "syndicate" + emp_vunerable = 0 /obj/machinery/porta_turret/syndicate/setup() return From e93fc3c6d204ca8b59bca209e9612a89d6d2ea79 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 18 Nov 2015 21:23:32 +0100 Subject: [PATCH 5/7] Turrets now need to be linked to built turret controls using multiool. Map-placed ones autolink as before Changes multitool buffer type to better reflect the use --- code/game/machinery/portable_turret.dm | 59 ++++++++++++------- .../telecomms/machine_interactions.dm | 18 +++--- code/game/objects/items/devices/multitool.dm | 2 +- 3 files changed, 50 insertions(+), 29 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 6043a7d3055..8349f93e1be 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -312,7 +312,10 @@ user << "Controls are now [locked ? "locked" : "unlocked"]." else user << "Access denied." - + else if(istype(I,/obj/item/device/multitool) && !locked) + var/obj/item/device/multitool/M = I + M.buffer = src + user << "You add [src] to multitool buffer." else //if the turret was attacked with the intention of harming it: user.changeNext_move(CLICK_CD_MELEE) @@ -924,7 +927,10 @@ updateUsrDialog() else user << "Access denied." - + else if(istype(I,/obj/item/device/multitool) && !Parent_Turret.locked) + var/obj/item/device/multitool/M = I + M.buffer = Parent_Turret + user << "You add [Parent_Turret] to multitool buffer." else user.changeNext_move(CLICK_CD_MELEE) Parent_Turret.health -= I.force * 0.5 @@ -992,38 +998,52 @@ var/enabled = 1 var/lethal = 0 var/locked = 1 - var/control_area //can be area name, path or nothing. + var/control_area = null //can be area name, path or nothing. var/ailock = 0 // AI cannot use this req_access = list(access_ai_upload) + var/list/obj/machinery/porta_turret/turrets = list() /obj/machinery/turretid/New(loc, ndir = 0, built = 0) ..() - if(!control_area) - var/area/CA = get_area(src) - if(CA.master && CA.master != CA) - control_area = CA.master - else - control_area = CA - else if(istext(control_area)) - for(var/area/A in world) - if(A.name && A.name==control_area) - control_area = A - break if(built) dir = ndir locked = 0 pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 power_change() //Checks power and initial settings - //don't have to check if control_area is path, since get_area_all_atoms can take path. return -/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/turretid/initialize() //map-placed turrets autolink turrets + if(control_area && istext(control_area)) + for(var/area/A in world) + if(A.name && A.name==control_area) + control_area = A + break + + if(!control_area) + var/area/CA = get_area(src) + if(CA.master && CA.master != CA) + control_area = CA.master + else + control_area = CA + + for(var/obj/machinery/porta_turret/T in get_area_all_atoms(control_area)) + turrets |= T + +/obj/machinery/turretid/attackby(obj/item/I, mob/user, params) if(stat & BROKEN) return + + if (istype(I,/obj/item/device/multitool)) + var/obj/item/device/multitool/M = I + if(M.buffer && istype(M.buffer,/obj/machinery/porta_turret)) + turrets |= M.buffer + user << "You link [M.buffer] with [src]" + return + if (istype(user, /mob/living/silicon)) return src.attack_hand(user) - else if( get_dist(src, user) == 0 ) // trying to unlock the interface + if( get_dist(src, user) == 0 ) // trying to unlock the interface if (src.allowed(usr)) if(emagged) user << "The turret control is unresponsive." @@ -1110,9 +1130,8 @@ updateTurrets() /obj/machinery/turretid/proc/updateTurrets() - if(control_area) - for (var/obj/machinery/porta_turret/aTurret in get_area_all_atoms(control_area)) - aTurret.setState(enabled, lethal) + for (var/obj/machinery/porta_turret/aTurret in turrets) + aTurret.setState(enabled, lethal) src.update_icon() /obj/machinery/turretid/power_change() diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 4dd96c01c8c..bb394d55184 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -94,8 +94,9 @@ dat += "
" if(P) - if(P.buffer) - dat += "

MULTITOOL BUFFER: [P.buffer] ([P.buffer.id]) \[Link\] \[Flush\]" + var/obj/machinery/telecomms/T = P.buffer + if(T && istype(T)) + dat += "

MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else dat += "

MULTITOOL BUFFER: \[Add Machine\]" @@ -284,14 +285,15 @@ if(href_list["link"]) if(P) - if(P.buffer && P.buffer != src) - if(!(src in P.buffer.links)) - P.buffer.links.Add(src) + var/obj/machinery/telecomms/T = P.buffer + if(T && istype(T) && T != src) + if(!(src in T.links)) + T.links.Add(src) - if(!(P.buffer in src.links)) - src.links.Add(P.buffer) + if(!(T in src.links)) + src.links.Add(T) - temp = "-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-" + temp = "-% Successfully linked with \ref[T] [T.name] %-" else temp = "-% Unable to acquire buffer %-" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index bd2ae7268f6..39a8afa9ff8 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -15,7 +15,7 @@ throw_speed = 3 materials = list(MAT_METAL=50, MAT_GLASS=20) origin_tech = "magnets=1;engineering=1" - var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage + var/obj/machinery/buffer // simple machine buffer for device linkage hitsound = 'sound/weapons/tap.ogg' From 7ead90f24b7e30d8079aa31580a39a53052cbc65 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 25 Nov 2015 14:46:16 +0100 Subject: [PATCH 6/7] Map Changes 3.0 --- _maps/map_files/AsteroidStation/AsteroidStation.dmm | 6 +++--- _maps/map_files/BirdStation/BirdStation.dmm | 6 +++--- _maps/map_files/DiscStation/DiscStation.dmm | 6 +++--- _maps/map_files/DreamStation/dreamstation04.dmm | 6 +++--- _maps/map_files/MetaStation/MetaStation.v41I.dmm | 6 +++--- _maps/map_files/MiniStation/MiniStation.dmm | 8 ++++---- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 8 ++++---- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 7d436e60ea5..11aca7800dd 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -6468,10 +6468,10 @@ "cut" = (/obj/structure/table,/obj/item/weapon/circular_saw,/obj/item/weapon/cautery{pixel_x = 4},/obj/item/weapon/surgical_drapes,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) "cuu" = (/obj/structure/table/optable,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor3"},/area/shuttle/escape) "cuv" = (/turf/simulated/wall/shuttle,/area/shuttle/escape) -"cuw" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"cuw" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "cux" = (/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "cuy" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/shuttle/syndicate) -"cuz" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"cuz" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "cuA" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cuB" = (/obj/machinery/computer/shuttle/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cuC" = (/obj/structure/table,/obj/machinery/button/door{id = "syndieshutters"; name = "remote shutter control"; req_access_txt = "150"},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) @@ -6491,7 +6491,7 @@ "cuQ" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cuR" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cuS" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"cuT" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"cuT" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "cuU" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cuV" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cuW" = (/obj/structure/bed/stool,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) diff --git a/_maps/map_files/BirdStation/BirdStation.dmm b/_maps/map_files/BirdStation/BirdStation.dmm index e07b32a71ad..3e2cfe583ca 100644 --- a/_maps/map_files/BirdStation/BirdStation.dmm +++ b/_maps/map_files/BirdStation/BirdStation.dmm @@ -1,9 +1,9 @@ "aaa" = (/turf/space,/area/space) "aab" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_n"; name = "north of station"; turf_type = /turf/space; width = 18},/turf/space,/area/space) -"aac" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"aac" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "aad" = (/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "aae" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/shuttle/syndicate) -"aaf" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"aaf" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "aag" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aah" = (/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aai" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) @@ -24,7 +24,7 @@ "aax" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aay" = (/obj/structure/lattice,/turf/space,/area/space) "aaz" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"aaA" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"aaA" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "aaB" = (/obj/structure/lattice/catwalk,/turf/space,/area/space) "aaC" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aaD" = (/obj/structure/closet/syndicate/nuclear,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) diff --git a/_maps/map_files/DiscStation/DiscStation.dmm b/_maps/map_files/DiscStation/DiscStation.dmm index 6bd8d1d4f51..b365cbe6c57 100644 --- a/_maps/map_files/DiscStation/DiscStation.dmm +++ b/_maps/map_files/DiscStation/DiscStation.dmm @@ -1,8 +1,8 @@ "aaa" = (/turf/space,/area/space) -"aab" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"aab" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "aac" = (/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "aad" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/shuttle/syndicate) -"aae" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"aae" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "aaf" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aag" = (/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aah" = (/obj/structure/table,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 1},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) @@ -23,7 +23,7 @@ "aaw" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aax" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aay" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"aaz" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"aaz" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "aaA" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aaB" = (/obj/structure/closet/syndicate/nuclear,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "aaC" = (/obj/structure/bed/stool,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm index 6419d230a78..4c46d4e31cd 100644 --- a/_maps/map_files/DreamStation/dreamstation04.dmm +++ b/_maps/map_files/DreamStation/dreamstation04.dmm @@ -184,7 +184,7 @@ "adB" = (/obj/structure/cable/blue{tag = "icon-4-8"; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel/black,/area/aisat) "adC" = (/obj/structure/cable/blue{tag = "icon-4-8"; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "65"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/aisat) "adD" = (/obj/structure/cable/blue{tag = "icon-1-8"; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plating,/area/aisat) -"adE" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"adE" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "adF" = (/turf/simulated/floor/plasteel/darkwarning,/area/aisat) "adG" = (/obj/machinery/bluespace_beacon,/turf/simulated/floor/plasteel/darkwarning,/area/aisat) "adH" = (/obj/machinery/status_display{layer = 3; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel/darkwarning/corner{tag = "icon-warndarkcorners (NORTH)"; icon_state = "warndarkcorners"; dir = 1},/area/aisat) @@ -4232,7 +4232,7 @@ "bDt" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel/black,/area/security/prison) "bDu" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "bDv" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/security/prison) -"bDw" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"bDw" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "bDx" = (/turf/simulated/floor/plasteel/escape{tag = "icon-escape (SOUTHWEST)"; icon_state = "escape"; dir = 10},/turf/simulated/floor/plasteel/warningline{tag = "icon-warningline (SOUTHWEST)"; icon_state = "warningline"; dir = 10},/area/hallway/secondary/exit) "bDy" = (/turf/simulated/floor/plasteel/escape,/area/hallway/secondary/exit) "bDz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel/escape,/area/hallway/secondary/exit) @@ -7132,7 +7132,7 @@ "cHh" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cHi" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cHj" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"cHk" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"cHk" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "cHl" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cHm" = (/turf/simulated/floor/plasteel/whitepurple/side{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Toxins Lab"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel/warningline{tag = "icon-warningline (NORTH)"; icon_state = "warningline"; dir = 1},/area/toxins/mixing) "cHn" = (/obj/structure/bed/stool,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) diff --git a/_maps/map_files/MetaStation/MetaStation.v41I.dmm b/_maps/map_files/MetaStation/MetaStation.v41I.dmm index 8c44223d832..ef555d2694e 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41I.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41I.dmm @@ -1,7 +1,7 @@ "aaa" = (/turf/space,/area/space) "aab" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_n"; name = "north of station"; turf_type = /turf/space; width = 18},/turf/space,/area/space) "aac" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/space) -"aad" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"aad" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "aae" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/space; width = 18},/turf/space,/area/space) "aaf" = (/obj/structure/lattice,/turf/space,/area/space) "aag" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) @@ -4977,7 +4977,7 @@ "bRK" = (/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bRL" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos) "bRM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/hallway/secondary/entry{name = "Arrivals"}) -"bRN" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"bRN" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "bRO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bRP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating{icon_state = "platingdmg2"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "bRQ" = (/obj/structure/closet/crate,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/weapon/poster/legit,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -7994,7 +7994,7 @@ "cXL" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cXM" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cXN" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"cXO" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"cXO" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "cXP" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cXQ" = (/obj/structure/closet/syndicate/nuclear,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cXR" = (/obj/structure/bed/stool,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index aade6a1bc4e..4d625879bf7 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -226,7 +226,7 @@ "er" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/machinery/alarm{frequency = 1442; pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "es" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) "et" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/spawner/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/brig) -"eu" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"eu" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "ev" = (/obj/machinery/suit_storage_unit/mining,/turf/simulated/floor/plasteel{dir = 8; icon_state = "brown"},/area/quartermaster/storage) "ew" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "ex" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plasteel,/area/quartermaster/storage) @@ -1229,7 +1229,7 @@ "xG" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "xH" = (/obj/structure/closet/l3closet,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "xI" = (/turf/simulated/wall/shuttle{icon_state = "swall_s9"; dir = 2},/area/shuttle/arrival) -"xJ" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"xJ" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "xK" = (/obj/structure/table,/obj/machinery/microwave,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "xL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/hallway/primary/central) "xM" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/meter{use_power = 0},/turf/space,/area/space) @@ -1542,7 +1542,7 @@ "DH" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "DI" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "DJ" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) -"DK" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"DK" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "DL" = (/obj/machinery/atmospherics/pipe/heat_exchanging/simple{dir = 9},/obj/structure/lattice,/turf/space,/area/engine/engineering) "DM" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "DN" = (/obj/structure/closet/syndicate/nuclear,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) @@ -1802,7 +1802,7 @@ "IH" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/transport) "II" = (/turf/simulated/wall/shuttle{icon_state = "swall_s9"; dir = 2},/area/shuttle/transport) "IJ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; frequency = 1441; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index ee8438f5511..a0b69a01629 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -662,7 +662,7 @@ "amL" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/processing) "amM" = (/obj/machinery/door/airlock/glass_security{name = "Prisoner Processing"; req_access_txt = "2"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/security/processing) "amN" = (/obj/structure/table,/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) -"amO" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"amO" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "amP" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/shuttle/syndicate) "amQ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/grille,/obj/structure/cable,/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "brig shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) "amR" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "Secure Gate"; name = "brig shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/security/brig) @@ -823,7 +823,7 @@ "apQ" = (/obj/structure/lattice,/turf/space,/area/space/nearstation) "apR" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/plating,/area/security/processing) "apS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/security/processing) -"apT" = (/turf/space,/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) +"apT" = (/turf/space,/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "apU" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "apV" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/security/detectives_office) "apW" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint) @@ -6074,7 +6074,7 @@ "cmP" = (/turf/space,/turf/simulated/wall/shuttle{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate) "cmQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) "cmR" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plasteel,/area/engine/engineering) -"cmS" = (/obj/machinery/gun_turret,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) +"cmS" = (/obj/machinery/porta_turret/syndicate,/turf/simulated/wall/shuttle{icon_state = "wall3"},/area/shuttle/syndicate) "cmT" = (/obj/machinery/suit_storage_unit/syndicate,/turf/simulated/floor/plasteel/shuttle{icon_state = "shuttlefloor4"},/area/shuttle/syndicate) "cmU" = (/obj/machinery/light/small,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "cmV" = (/obj/machinery/light/small,/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos) @@ -6746,7 +6746,7 @@ "czL" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/status_display{density = 0; layer = 3; pixel_x = 0; pixel_y = 32},/obj/machinery/computer/shuttle/pod{pixel_y = -32; possible_destinations = "pod_asteroid4"; shuttleId = "pod4"},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/pod_4) "czM" = (/obj/structure/bed/chair{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/obj/item/weapon/storage/pod{pixel_x = 6; pixel_y = -32},/turf/simulated/floor/plasteel/shuttle,/area/shuttle/pod_4) "czN" = (/obj/docking_port/stationary/random{dir = 4; id = "pod_asteroid4"; name = "asteroid"},/turf/space,/area/space) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 18feac742a16641fc0fd13a44215a66bfa1b7ace Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 27 Nov 2015 21:31:47 +0100 Subject: [PATCH 7/7] Stuff --- code/game/machinery/portable_turret.dm | 4 ++-- code/game/machinery/telecomms/machine_interactions.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 8349f93e1be..055323226cb 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -1016,7 +1016,7 @@ /obj/machinery/turretid/initialize() //map-placed turrets autolink turrets if(control_area && istext(control_area)) for(var/area/A in world) - if(A.name && A.name==control_area) + if(A.name == control_area) control_area = A break @@ -1037,7 +1037,7 @@ var/obj/item/device/multitool/M = I if(M.buffer && istype(M.buffer,/obj/machinery/porta_turret)) turrets |= M.buffer - user << "You link [M.buffer] with [src]" + user << "You link \the [M.buffer] with \the [src]" return if (istype(user, /mob/living/silicon)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index bb394d55184..c4ce6fa4612 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -95,7 +95,7 @@ if(P) var/obj/machinery/telecomms/T = P.buffer - if(T && istype(T)) + if(istype(T)) dat += "

MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" else dat += "

MULTITOOL BUFFER: \[Add Machine\]" @@ -286,7 +286,7 @@ if(P) var/obj/machinery/telecomms/T = P.buffer - if(T && istype(T) && T != src) + if(istype(T) && T != src) if(!(src in T.links)) T.links.Add(src)