From e103cc799e58df65ea4c3e20546676b25ff9c925 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 18 Oct 2012 15:22:54 +0200 Subject: [PATCH 1/4] Fixes a runtime. --- code/datums/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index a64122f70c2..722234ef32f 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -428,7 +428,7 @@ W = new wound_type(damage) if(BURN) - var/list/size_names = list(/datum/wound/moderate_burn, /datum/wound/large_burn, /datum/wound/severe_burn, /datum/wound/deep_burn, /datum/wound/carbonised_area) + var/list/size_names = list(/datum/wound/moderate_burn, /datum/wound/large_burn, /datum/wound/severe_burn, /datum/wound/deep_burn, /datum/wound/carbonised_area, /datum/wound/carbonised_area) wound_type = size_names[size] W = new wound_type(damage) From 01ba3871caf670001a2893b88acfcaf3c1ed8a6b Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 18 Oct 2012 15:33:46 +0200 Subject: [PATCH 2/4] Fixed the bug where 'Show Own Skills' wouldn't work. --- code/modules/mob/new_player/preferences.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 9a098946cf6..a0ddc987a63 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -1163,6 +1163,8 @@ datum/preferences character.h_style = h_style character.f_style = f_style + character.skills = skills + // Destroy/cyborgize organs for(var/name in organ_data) var/datum/organ/external/O = character.organs[name] From b0aee942a77f27e3d59d51119ab765d6d6adc3c1 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 18 Oct 2012 15:42:50 +0200 Subject: [PATCH 3/4] You can now exame an IV drip to get the loaded chemicals and attached person. --- code/game/machinery/iv_drip.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index e6456a07e6a..3faf3bebaf2 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -90,3 +90,23 @@ update_icon() else return ..() + +/obj/machinery/iv_drip/examine() + set src in view() + ..() + if (!(usr in view(2)) && usr!=src.loc) return + + if(beaker) + usr << "\blue Attached is \a [beaker] with:" + if(beaker.reagents && beaker.reagents.reagent_list.len) + for(var/datum/reagent/R in beaker.reagents.reagent_list) + usr << "\blue [R.volume] units of [R.name]" + else + usr << "\blue Attached is an empty [beaker]." + else + usr << "\blue No chemicals are attached." + + if(attached) + usr << "\blue [attached] is attached." + else + usr << "\blue No one is attached." \ No newline at end of file From ed6994d17cebe6fbb6460377a3ff008122ffc946 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 18 Oct 2012 16:33:14 +0200 Subject: [PATCH 4/4] Removed the silly adminhelp delay. --- code/modules/admin/verbs/adminhelp.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 9023d34e9f6..9fe4f7d4f62 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -14,9 +14,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali if (src.handle_spam_prevention(msg,MUTE_ADMINHELP)) return - src.verbs -= /client/verb/adminhelp + /**src.verbs -= /client/verb/adminhelp spawn(1200) - src.verbs += /client/verb/adminhelp // 2 minute cool-down for adminhelps + src.verbs += /client/verb/adminhelp // 2 minute cool-down for adminhelps//Go to hell + **/ if(!msg) return msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))