From 94ffb49bfbf6e151f2026526755f55794fcb0678 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 26 Jun 2015 01:04:03 +0100 Subject: [PATCH 1/5] Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end --- code/game/gamemodes/cult/cult.dm | 1 + code/game/gamemodes/nuclear/nuclear.dm | 3 ++- code/game/gamemodes/revolution/anti_revolution.dm | 3 ++- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/revolution/rp-revolution.dm | 2 ++ code/game/gamemodes/revolution/rp_revolution.dm | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index b86f46fa89..9ff016d7e5 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -280,6 +280,7 @@ /datum/game_mode/cult/declare_completion() if(config.objectives_disabled) + ..() return 1 if(!check_cult_victory()) feedback_set_details("round_end_result","win - cult win") diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b2e54da0d9..a9ecba29a7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -243,6 +243,7 @@ var/global/list/turf/synd_spawn = list() /datum/game_mode/nuclear/declare_completion() if(config.objectives_disabled) + ..() return var/disk_rescued = 1 for(var/obj/item/weapon/disk/nuclear/D in world) @@ -343,4 +344,4 @@ var/global/list/turf/synd_spawn = list() else synd_mind.current.name = choose_name synd_mind.current.real_name = choose_name - return \ No newline at end of file + return diff --git a/code/game/gamemodes/revolution/anti_revolution.dm b/code/game/gamemodes/revolution/anti_revolution.dm index fce1cace91..823b7d5fb3 100644 --- a/code/game/gamemodes/revolution/anti_revolution.dm +++ b/code/game/gamemodes/revolution/anti_revolution.dm @@ -191,6 +191,7 @@ feedback_add_details("head_objective","[objective.type]|FAIL") count++ break // just print once + ..() return 1 @@ -219,4 +220,4 @@ src.verbs -= /mob/proc/ResignFromHeadPosition - src << "\red You resigned from your position, now you have the consequences." \ No newline at end of file + src << "\red You resigned from your position, now you have the consequences." diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 71e9704606..428757245a 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -353,7 +353,7 @@ else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") world << "\red The heads of staff managed to stop the revolution!" - ..() + ..() return 1 /datum/game_mode/proc/auto_declare_completion_revolution() diff --git a/code/game/gamemodes/revolution/rp-revolution.dm b/code/game/gamemodes/revolution/rp-revolution.dm index 815b3be3cb..8af3deabc3 100644 --- a/code/game/gamemodes/revolution/rp-revolution.dm +++ b/code/game/gamemodes/revolution/rp-revolution.dm @@ -270,6 +270,8 @@ text += "[head_mind.key] (character destroyed)" world << text + + ..() return 1 diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 5cf1bcc08d..94581909dd 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -146,7 +146,7 @@ else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") world << "\red The heads of staff managed to stop the revolution!" - ..() + ..() return 1 /datum/game_mode/revolution/proc/is_convertible(mob/M) From 90f08d3fa7d53270e2a684294dbaf76df2bdb8bf Mon Sep 17 00:00:00 2001 From: Atlantis Date: Fri, 26 Jun 2015 18:22:59 +0200 Subject: [PATCH 2/5] Fixes #9929 - Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code. --- code/modules/power/generator.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index f6f7f135e2..c73bd19aa8 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -145,6 +145,10 @@ "You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.", \ "You hear a ratchet") use_power = anchored + if(anchored) // Powernet connection stuff. + connect_to_network() + else + disconnect_from_network() reconnect() else ..() From ba3d180db6c167d284d215314a6cd172925bda6a Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Fri, 26 Jun 2015 11:45:11 -0700 Subject: [PATCH 3/5] Remove posi-mmi-mechs fix actual removal --- code/game/mecha/combat/combat.dm | 9 ----- code/game/mecha/mecha.dm | 67 -------------------------------- 2 files changed, 76 deletions(-) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index f75bd01ac4..e9cf59be6d 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -244,15 +244,6 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(..()) - if(occupant.client) - occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") - return 1 - else - return 0 - - /obj/mecha/combat/go_out() if(src.occupant && src.occupant.client) src.occupant.client.mouse_pointer_icon = initial(src.occupant.client.mouse_pointer_icon) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index b2bdadfdbe..25a28aa532 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -687,14 +687,6 @@ /obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) - - if(istype(W, /obj/item/device/mmi)) - if(mmi_move_inside(W,user)) - user << "[src]-MMI interface initialized successfuly" - else - user << "[src]-MMI interface initialization failed." - return - if(istype(W, /obj/item/mecha_parts/mecha_equipment)) var/obj/item/mecha_parts/mecha_equipment/E = W spawn() @@ -1086,65 +1078,6 @@ else return 0 -/obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." - return 0 - else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." - return 0 - else if(occupant) - user << "Occupant detected." - return 0 - else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) - user << "Stop it!" - return 0 - //Added a message here since people assume their first click failed or something./N -// user << "Installing MMI, please stand by." - - visible_message("\blue [usr] starts to insert an MMI into [src.name]") - - if(enter_after(40,user)) - if(!occupant) - return mmi_moved_inside(mmi_as_oc,user) - else - user << "Occupant detected." - else - user << "You stop inserting the MMI." - return 0 - -/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(mmi_as_oc && user in range(1)) - if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." - return 0 - else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." - return 0 - user.drop_from_inventory(mmi_as_oc) - var/mob/brainmob = mmi_as_oc.brainmob - brainmob.reset_view(src) - /* - brainmob.client.eye = src - brainmob.client.perspective = EYE_PERSPECTIVE - */ - occupant = brainmob - brainmob.loc = src //should allow relaymove - brainmob.canmove = 1 - mmi_as_oc.loc = src - mmi_as_oc.mecha = src - src.verbs -= /obj/mecha/verb/eject - src.Entered(mmi_as_oc) - src.Move(src.loc) - src.icon_state = src.reset_icon() - set_dir(dir_in) - src.log_message("[mmi_as_oc] moved in as pilot.") - if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) - return 1 - else - return 0 - /obj/mecha/verb/view_stats() set name = "View Stats" set category = "Exosuit Interface" From 3c3d6f3497dd86fe0eddec5af42dce9a66900612 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 27 Jun 2015 08:59:27 +0100 Subject: [PATCH 4/5] Un-breaks hats, semi-fixes #9873, partially reverts #9937 --- code/modules/mob/living/carbon/human/update_icons.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index d25802b2f7..70ce9d9e03 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -698,8 +698,10 @@ proc/get_damage_icon_part(damage_state, body_part) //Determine the state to use var/t_state = head.icon_state - if(head.item_state) - t_state = head.item_state + if(istype(head, /obj/item/weapon/paper)) + /* I don't like this, but bandaid to fix half the hats in the game + being completely broken without re-breaking paper hats */ + t_state = "paper" //Create the image var/image/standing = image(icon = t_icon, icon_state = t_state) From 17fa1d77e7dcf3a849ad2c680b829a8e08a9f4a8 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 27 Jun 2015 14:27:25 +0200 Subject: [PATCH 5/5] Adds the Windows Thumbs.db files to the ignore list. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f2ce0fe4b8..c824a920cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ #ignore misc BYOND files +Thumbs.db *.log *.int *.rsc @@ -7,3 +8,4 @@ *.backup data/ cfg/ +