From ff475635b719fe5c23f268415c5a115647b3807c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 05:31:53 +0930 Subject: [PATCH 01/10] Fixes #5448 --- code/modules/mob/living/carbon/human/human.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b70dce9446..000600781b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -174,7 +174,7 @@ var/eta_status = emergency_shuttle.get_status_panel_eta() if(eta_status) stat(null, eta_status) - + if (client.statpanel == "Status") if (internal) if (!internal.air_contents) @@ -1397,6 +1397,11 @@ T.Weaken(5) + //Only official raider vox get the grab and no self-prone." + if(src.mind && src.mind.special_role != "Vox Raider") + src.Weaken(5) + return + var/use_hand = "left" if(l_hand) if(r_hand) From b6806c0d22e8180c75a1b9eaf6ff74ab391c1562 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 05:35:28 +0930 Subject: [PATCH 02/10] Fixes #5443 --- code/game/machinery/suit_storage_unit.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f939e24a6b..58da1b1d9e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -827,9 +827,11 @@ helmet.loc = get_turf(src) helmet = null else if(href_list["select_department"]) - target_department = input("Please select the target department paintjob.","Suit cycler",null) as null|anything in departments + var/choice = input("Please select the target department paintjob.","Suit cycler",null) as null|anything in departments + if(choice) target_department = choice else if(href_list["select_species"]) - target_species = input("Please select the target species configuration.","Suit cycler",null) as null|anything in species + var/choice = input("Please select the target species configuration.","Suit cycler",null) as null|anything in species + if(choice) target_species = choice else if(href_list["select_rad_level"]) var/choices = list(1,2,3) if(emagged) From a6c9b1d81b0ff927ec39262aad3a287a0c7fcf75 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 05:35:56 +0930 Subject: [PATCH 03/10] Fixes #5446 --- code/modules/mob/living/carbon/human/human_damage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index e03f240a88..0deb746059 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -299,7 +299,7 @@ This function restores all organs. //Embedded object code. if(!organ) return - if(istype(used_weapon,/obj/item)) + if(istype(used_weapon,/obj/item) && !istype(used_weapon.loc,/mob/living/silicon/robot)) var/obj/item/W = used_weapon //Sharp objects will always embed if they do enough damage. if((damage > (10*W.w_class)) || ((sharp && !ismob(W.loc)) || prob(damage/W.w_class))) organ.embed(W) From a55b447100489474b13c1b90b951adea42b32ed6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 05:37:26 +0930 Subject: [PATCH 04/10] Fixes #5450 --- code/WorkInProgress/computer3/laptop.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index 4b3368b946..1868f82c83 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -78,7 +78,7 @@ ..(L,built) verb/close_computer() - set name = "close laptop" + set name = "Close Laptop" set category = "Object" set src in view(1) From aa4581e72fda41004bfdfeafb24e8d670bb8d837 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 06:17:26 +0930 Subject: [PATCH 05/10] Fixes #5434 --- code/game/objects/structures.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 8044f3d4fe..acda76099d 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -47,7 +47,10 @@ if (!can_touch(user) || !climbable) return - usr.visible_message("[user] starts climbing onto \the [src]!") + if(locate(/obj/machinery/door/poddoor/shutters) in src.contents) return + + var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents + if(S && S.density) return if(!do_after(user,50)) return @@ -55,6 +58,9 @@ if (!can_touch(user) || !climbable) return + var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents + if(S && S.density) return + usr.loc = get_turf(src) if (get_turf(user) == get_turf(src)) usr.visible_message("[user] climbs onto \the [src]!") From 04a6ea92dbffe84f73b7f26708b686249212f371 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 06:17:54 +0930 Subject: [PATCH 06/10] Adds Eject ID verbs to record computers. --- code/game/machinery/computer/medical.dm | 17 +++++++++++++++++ code/game/machinery/computer/security.dm | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index b9c821e18e..2949498ae3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -16,6 +16,23 @@ var/temp = null var/printing = null +/obj/machinery/computer/med_data/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + if(!usr || usr.stat || usr.lying) return + + if(scan) + usr << "You remove \the [scan] from \the [src]." + scan.loc = get_turf(src) + if(!usr.get_active_hand()) + usr.put_in_hands(scan) + scan = null + else + usr << "There is nothing to remove from the console." + return + /obj/machinery/computer/med_data/attackby(obj/item/O as obj, user as mob) if(istype(O, /obj/item/weapon/card/id) && !scan) usr.drop_item() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 5cbd9bde9c..58a77c950d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -22,6 +22,22 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending +/obj/machinery/computer/secure_data/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + if(!usr || usr.stat || usr.lying) return + + if(scan) + usr << "You remove \the [scan] from \the [src]." + scan.loc = get_turf(src) + if(!usr.get_active_hand()) + usr.put_in_hands(scan) + scan = null + else + usr << "There is nothing to remove from the console." + return /obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob) if(istype(O, /obj/item/weapon/card/id) && !scan) From 41488bf4976fa95900f323fd02db190f5430ba55 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 06:35:19 +0930 Subject: [PATCH 07/10] Compile fix. --- code/game/objects/structures.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index acda76099d..f0b8d0faa7 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -58,7 +58,7 @@ if (!can_touch(user) || !climbable) return - var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents + S = locate() in src.contents if(S && S.density) return usr.loc = get_turf(src) From 34f7ba30d5aae4f2247616c95ca401a208a9009f Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 06:46:42 +0930 Subject: [PATCH 08/10] Fixes guest terminals only allowing 29 minute passes. --- code/WorkInProgress/Chinsky/guestpass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/Chinsky/guestpass.dm b/code/WorkInProgress/Chinsky/guestpass.dm index 5c16e83879..5f798fa61a 100644 --- a/code/WorkInProgress/Chinsky/guestpass.dm +++ b/code/WorkInProgress/Chinsky/guestpass.dm @@ -127,7 +127,7 @@ if ("duration") var/dur = input("Duration (in minutes) during which pass is valid (up to 30 minutes).", "Duration") as num|null if (dur) - if (dur > 0 && dur < 30) + if (dur > 0 && dur <= 30) duration = dur else usr << "Invalid duration." From 9815eef21faa2440d68451e5011b550d2b2de09b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 07:00:40 +0930 Subject: [PATCH 09/10] Oversight with table fix. --- code/game/objects/structures.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index f0b8d0faa7..b9b79c905b 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -47,8 +47,6 @@ if (!can_touch(user) || !climbable) return - if(locate(/obj/machinery/door/poddoor/shutters) in src.contents) return - var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents if(S && S.density) return From ff9682af790e4a2a024d113a44859f766efe8cc6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Jul 2014 07:28:51 +0930 Subject: [PATCH 10/10] Wtf how did this line even get deleted. --- code/game/objects/structures.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index b9b79c905b..a041ad9be1 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -50,6 +50,8 @@ var/obj/machinery/door/poddoor/shutters/S = locate() in src.contents if(S && S.density) return + usr.visible_message("[user] starts climbing onto \the [src]!") + if(!do_after(user,50)) return