From a4793fd2081efa757ca7404f6a8c4bdfb038756e Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:08:04 +0300 Subject: [PATCH 1/8] Typo fix. --- code/modules/mob/living/carbon/monkey/monkey.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 29c0b4defbc..ba232f59ced 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -39,7 +39,7 @@ reagents = R R.my_atom = src - if(name == "monkey" || name == "farwa" || name == "stok" || name == "neara" || name == "diona nymph") //Hideous but necessary to stop Pun-Pun becoming generic. + if(name == "monkey" || name == "farwa" || name == "stok" || name == "neaera" || name == "diona nymph") //Hideous but necessary to stop Pun-Pun becoming generic. name = "[name] ([rand(1, 1000)])" real_name = name From 8be67352ea88f58e329e143edc695e60633c1ded Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:16:00 +0300 Subject: [PATCH 2/8] Typo fix. --- code/modules/surgery/braincore.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index f4d81d37f59..c95904dcd7c 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -122,8 +122,8 @@ return ..() && target.brain_op_stage == 2 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts taking out bone chips and out of [target]'s brain with \the [tool].", \ - "You start taking out bone chips and out of [target]'s brain with \the [tool].") + user.visible_message("[user] starts taking out bone chips out of [target]'s brain with \the [tool].", \ + "You start taking out bone chips out of [target]'s brain with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) From 17f38e109d0b34ffd353f0f138a5d3da2be11960 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:16:46 +0300 Subject: [PATCH 3/8] Missing language. --- code/modules/mob/living/carbon/species.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 1c26c0051bd..76ab17fbd47 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -39,6 +39,7 @@ /datum/species/human name = "Human" + language = "Sol Common" primitive = /mob/living/carbon/monkey flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR From 464fc22fa5a3a764661189b29501d8b0ee527a0a Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:18:43 +0300 Subject: [PATCH 4/8] Missing verb. --- code/modules/paperwork/paper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 439bf62baf1..66cbc91419a 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -16,7 +16,7 @@ pressure_resistance = 1 slot_flags = SLOT_HEAD body_parts_covered = HEAD - attack_verb = list("") + attack_verb = list("bapped") var/info //What's actually written on the paper. var/info_links //A different version of the paper which includes html links at fields and EOF From 7ea98f6d7957537a31d27144393f8832a0756643 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:19:58 +0300 Subject: [PATCH 5/8] Examining fix. --- code/game/objects/items/weapons/storage/fancy.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 6fb0ab4cc9a..cd0b988bea7 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -27,6 +27,7 @@ /obj/item/weapon/storage/fancy/examine() set src in oview(1) + ..() if(contents.len <= 0) usr << "There are no [src.icon_type]s left in the box." else if(contents.len == 1) From 775d723f68ffe4c39ac4c2b7937645080c14cc18 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:21:14 +0300 Subject: [PATCH 6/8] Typecheck. --- code/modules/mob/living/carbon/monkey/diona.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 7846965a6d3..3780cdb6836 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -93,7 +93,7 @@ set desc = "Take a blood sample from a suitable donor." var/list/choices = list() - for(var/mob/living/C in view(1,src)) + for(var/mob/living/carbon/C in view(1,src)) if(C.real_name != real_name) choices += C From 3d6791df812163f03230273358eebda50bf827ea Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 10:22:58 +0300 Subject: [PATCH 7/8] Fix for pockets. --- code/modules/clothing/clothing.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a02616b556b..daf28f92969 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -310,9 +310,6 @@ BLIND // can't see anything if(usr.stat) return if(hastie) - usr.put_in_hands(hastie) - hastie = null - if (istype(hastie,/obj/item/clothing/tie/holster)) verbs -= /obj/item/clothing/under/proc/holster @@ -320,7 +317,10 @@ BLIND // can't see anything verbs -= /obj/item/clothing/under/proc/storage var/obj/item/clothing/tie/storage/W = hastie if (W.hold) - W.hold.loc = hastie + W.hold.close(usr) + + usr.put_in_hands(hastie) + hastie = null if(istype(loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = loc From 367c1cf4f43d0f6c659390c68a7c3ed009ff7e9a Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 11 Oct 2013 11:10:27 +0300 Subject: [PATCH 8/8] Better check. --- code/modules/mob/living/carbon/monkey/monkey.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index ba232f59ced..07373c68382 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -39,7 +39,7 @@ reagents = R R.my_atom = src - if(name == "monkey" || name == "farwa" || name == "stok" || name == "neaera" || name == "diona nymph") //Hideous but necessary to stop Pun-Pun becoming generic. + if(name == initial(name)) //To stop Pun-Pun becoming generic. name = "[name] ([rand(1, 1000)])" real_name = name