From 824f9ceea894c38a7f4d8be61aaa75a2f98a26fa Mon Sep 17 00:00:00 2001 From: Mike Date: Fri, 16 May 2014 13:13:02 -0400 Subject: [PATCH 1/6] do_after() checks both turf and loc --- code/__HELPERS/unsorted.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index ba60be32d76..3cf136a1d50 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -728,13 +728,14 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl var/delayfraction = round(delay/numticks) var/original_loc = user.loc + var/original_turf = get_turf(user) var/holding = user.get_active_hand() for(var/i = 0, i Date: Fri, 16 May 2014 21:26:08 -0700 Subject: [PATCH 2/6] Forgot I would need a null check. --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index aa618fd5ad2..3f5586c078c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -555,7 +555,7 @@ datum/preferences return proc/SetAntagoptions(mob/user) - if(uplinklocation == "") + if(uplinklocation == "" || !uplinklocation) uplinklocation = "PDA" var/HTML = "" HTML += "
" From 7c1d8b32d0a42bbd81da290241de68ceb4e11f2d Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Sat, 17 May 2014 16:01:49 -0500 Subject: [PATCH 3/6] Humanoid mobs won't default to having an undershirt. --- code/modules/mob/living/carbon/human/human_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index f22eb0db410..e50aeee66c1 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -24,7 +24,7 @@ var/b_type = "A+" //Player's bloodtype var/underwear = 1 //Which underwear the player wants - var/undershirt = 1 //Which undershirt the player wants. + var/undershirt = 0 //Which undershirt the player wants. var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack. //Equipment slots From 401f5ff1f8c89d4bbf3606862a7ce6cd9d581e9d Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Thu, 22 May 2014 00:30:08 -0500 Subject: [PATCH 4/6] Holopad now states what it hears, what a revolutionary concept. --- code/game/machinery/hologram.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 5442248986a..22cb0dc741f 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -78,13 +78,13 @@ var/const/HOLOPAD_MODE = 0 /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. For the other part of the code, check silicon say.dm. Particularly robot talk.*/ -/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text) +/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb) if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something. if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad. text = stars(text) var/name_used = M.GetVoice() //This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only. - var/rendered = "Holopad received, [name_used] [M.say_quote(text)]" + var/rendered = "Holopad received, [name_used] [verb], \"[text]\"" master.show_message(rendered, 2) return @@ -210,4 +210,4 @@ Holographic project of everything else. name = "hologram projector" desc = "It makes a hologram appear...with magnets or something..." icon = 'icons/obj/stationobjs.dmi' - icon_state = "hologram0" \ No newline at end of file + icon_state = "hologram0" From 71ad2b3aae3b3fdd17611687c1520a59eb2e7f27 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 22 May 2014 16:44:26 -0400 Subject: [PATCH 5/6] Fixes bodybags not being able to be put back... ...into their own box. Also affects folded cryobags. --- code/game/objects/items/bodybag.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ef188a3112a..355330a2342 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -5,6 +5,7 @@ desc = "A folded bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" + w_class = 2.0 attack_self(mob/user) var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) From c4e811829e6e31c1d83c94e82f02d903cea855ed Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 22 May 2014 18:47:38 -0400 Subject: [PATCH 6/6] Fixes #5043 --- code/game/objects/items/weapons/storage/boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 83189aafd6b..3726a422473 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -452,7 +452,7 @@ foldable = /obj/item/stack/sheet/cardboard //BubbleWrap storage_slots=21 can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb") - max_combined_w_class = 21 + max_combined_w_class = 42 //holds 21 items of w_class 2 use_to_pickup = 1 // for picking up broken bulbs, not that most people will try /obj/item/weapon/storage/box/lights/bulbs/New()