From 6bf011233992dc487db1f976e21d04c90f1857a0 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 17 May 2020 23:56:30 -0400 Subject: [PATCH 1/2] Port Bay's Catwalks --- code/game/objects/structures.dm | 19 ++++++++++++ code/game/objects/structures/catwalk.dm | 39 +++++++++++++++++++++++++ code/modules/multiz/movement.dm | 3 ++ 3 files changed, 61 insertions(+) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index f89aa2edc91..a3c1e90c21e 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -223,6 +223,7 @@ if(istype(W)) W.update_connections(1) if(success) +<<<<<<< HEAD break if(success) break @@ -242,6 +243,24 @@ break if(success) break +======= + break // breaks inner loop + if(!success) + blend_obj_loop: + for(var/obj/O in T) + for(var/b_type in blend_objects) + if(istype(O, b_type)) + success = 1 + for(var/obj/structure/S in T) + if(istype(S, src)) + success = 0 + for(var/nb_type in noblend_objects) + if(istype(O, nb_type)) + success = 0 + + if(success) + break blend_obj_loop // breaks outer loop +>>>>>>> c62de50... Port Bay's Catwalks (#7083) if(success) dirs += get_dir(src, T) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index cb2e4342873..f26c427a222 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -28,6 +28,7 @@ /obj/structure/catwalk/Destroy() redraw_nearby_catwalks() +<<<<<<< HEAD update_falling() return ..() @@ -43,7 +44,31 @@ if(L) L.update_connections() L.update_icon() //so siding get updated properly +======= + return ..() +/obj/structure/catwalk/proc/redraw_nearby_catwalks() + for(var/direction in alldirs) + var/obj/structure/catwalk/L = locate() in get_step(src, direction) + if(L) + L.update_connections() + L.update_icon() //so siding get updated properly + +>>>>>>> c62de50... Port Bay's Catwalks (#7083) + +/obj/structure/catwalk/update_icon() + update_connections() + cut_overlays() + icon_state = "" + var/image/I + if(!hatch_open) + for(var/i = 1 to 4) + I = image(icon, "catwalk[connections[i]]", dir = 1<<(i-1)) + add_overlay(I) + if(plating_color) + I = image(icon, "plated") + I.color = plating_color + add_overlay(I) /obj/structure/catwalk/update_icon() update_connections() @@ -63,10 +88,17 @@ switch(severity) if(1) new /obj/item/stack/rods(src.loc) +<<<<<<< HEAD qdel(src) if(2) new /obj/item/stack/rods(src.loc) qdel(src) +======= + qdel(src) + if(2) + new /obj/item/stack/rods(src.loc) + qdel(src) +>>>>>>> c62de50... Port Bay's Catwalks (#7083) /obj/structure/catwalk/attack_robot(var/mob/user) if(Adjacent(user)) @@ -78,7 +110,11 @@ new /obj/item/stack/rods(src.loc) new /obj/item/stack/rods(src.loc) //Lattice would delete itself, but let's save ourselves a new obj +<<<<<<< HEAD if(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open)) +======= + if(isspace(loc) || isopenspace(loc)) +>>>>>>> c62de50... Port Bay's Catwalks (#7083) new /obj/structure/lattice/(src.loc) if(plated_tile) new plated_tile(src.loc) @@ -95,7 +131,10 @@ if(hatch_open) playsound(src, 'sound/items/Crowbar.ogg', 100, 2) to_chat(user, "You pry open \the [src]'s maintenance hatch.") +<<<<<<< HEAD update_falling() +======= +>>>>>>> c62de50... Port Bay's Catwalks (#7083) else playsound(src, 'sound/items/Deconstruct.ogg', 100, 2) to_chat(user, "You shut \the [src]'s maintenance hatch.") diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index f60dd4f8b81..174e0a696e0 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -72,6 +72,7 @@ else to_chat(src, "You gave up on pulling yourself up.") return 0 +<<<<<<< HEAD else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? var/mob/H = src if(H.flying) @@ -91,6 +92,8 @@ else to_chat(src, "Gravity stops you from moving upward.") return 0 //VOREStation Edit End. +======= +>>>>>>> c62de50... Port Bay's Catwalks (#7083) else to_chat(src, "Gravity stops you from moving upward.") return 0 From 7612c7a149a70cf2784febe148c7b395d56b420e Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 18 May 2020 09:17:21 -0400 Subject: [PATCH 2/2] Merge upstream PR --- code/game/objects/structures.dm | 22 -------------- code/game/objects/structures/catwalk.dm | 40 ------------------------- code/modules/multiz/movement.dm | 3 -- code/modules/tgs/v5/chat_commands.dm | 2 +- 4 files changed, 1 insertion(+), 66 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index a3c1e90c21e..f81419be75e 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -223,27 +223,6 @@ if(istype(W)) W.update_connections(1) if(success) -<<<<<<< HEAD - break - if(success) - break - if(!success) - for(var/obj/O in T) - for(var/b_type in blend_objects) - if(istype(O, b_type)) - success = 1 - for(var/obj/structure/S in T) - if(istype(S, src)) - success = 0 - for(var/nb_type in noblend_objects) - if(istype(O, nb_type)) - success = 0 - - if(success) - break - if(success) - break -======= break // breaks inner loop if(!success) blend_obj_loop: @@ -260,7 +239,6 @@ if(success) break blend_obj_loop // breaks outer loop ->>>>>>> c62de50... Port Bay's Catwalks (#7083) if(success) dirs += get_dir(src, T) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index f26c427a222..da481521d68 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -28,7 +28,6 @@ /obj/structure/catwalk/Destroy() redraw_nearby_catwalks() -<<<<<<< HEAD update_falling() return ..() @@ -44,31 +43,6 @@ if(L) L.update_connections() L.update_icon() //so siding get updated properly -======= - return ..() - -/obj/structure/catwalk/proc/redraw_nearby_catwalks() - for(var/direction in alldirs) - var/obj/structure/catwalk/L = locate() in get_step(src, direction) - if(L) - L.update_connections() - L.update_icon() //so siding get updated properly - ->>>>>>> c62de50... Port Bay's Catwalks (#7083) - -/obj/structure/catwalk/update_icon() - update_connections() - cut_overlays() - icon_state = "" - var/image/I - if(!hatch_open) - for(var/i = 1 to 4) - I = image(icon, "catwalk[connections[i]]", dir = 1<<(i-1)) - add_overlay(I) - if(plating_color) - I = image(icon, "plated") - I.color = plating_color - add_overlay(I) /obj/structure/catwalk/update_icon() update_connections() @@ -88,17 +62,10 @@ switch(severity) if(1) new /obj/item/stack/rods(src.loc) -<<<<<<< HEAD qdel(src) if(2) new /obj/item/stack/rods(src.loc) qdel(src) -======= - qdel(src) - if(2) - new /obj/item/stack/rods(src.loc) - qdel(src) ->>>>>>> c62de50... Port Bay's Catwalks (#7083) /obj/structure/catwalk/attack_robot(var/mob/user) if(Adjacent(user)) @@ -110,11 +77,7 @@ new /obj/item/stack/rods(src.loc) new /obj/item/stack/rods(src.loc) //Lattice would delete itself, but let's save ourselves a new obj -<<<<<<< HEAD - if(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open)) -======= if(isspace(loc) || isopenspace(loc)) ->>>>>>> c62de50... Port Bay's Catwalks (#7083) new /obj/structure/lattice/(src.loc) if(plated_tile) new plated_tile(src.loc) @@ -131,10 +94,7 @@ if(hatch_open) playsound(src, 'sound/items/Crowbar.ogg', 100, 2) to_chat(user, "You pry open \the [src]'s maintenance hatch.") -<<<<<<< HEAD update_falling() -======= ->>>>>>> c62de50... Port Bay's Catwalks (#7083) else playsound(src, 'sound/items/Deconstruct.ogg', 100, 2) to_chat(user, "You shut \the [src]'s maintenance hatch.") diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 174e0a696e0..f60dd4f8b81 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -72,7 +72,6 @@ else to_chat(src, "You gave up on pulling yourself up.") return 0 -<<<<<<< HEAD else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? var/mob/H = src if(H.flying) @@ -92,8 +91,6 @@ else to_chat(src, "Gravity stops you from moving upward.") return 0 //VOREStation Edit End. -======= ->>>>>>> c62de50... Port Bay's Catwalks (#7083) else to_chat(src, "Gravity stops you from moving upward.") return 0 diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm index e1635fa7c40..acae1365876 100644 --- a/code/modules/tgs/v5/chat_commands.dm +++ b/code/modules/tgs/v5/chat_commands.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) // Couldn't find them logged in. if(!user) - return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's \"ckey\" format. Please connect to the game server and try again." + return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's ckey format. Please connect to the game server and try again." var/sql_ckey = sql_sanitize_text(key_to_find) query = dbcon.NewQuery("SELECT discord_id FROM erro_player WHERE ckey = '[sql_ckey]'")