From 16685f06981423e69af6297e2b5c8dc011b4282d Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 18 Nov 2014 07:34:56 +0100 Subject: [PATCH 1/8] Fixes renwick shield generators incorrectly using power - Shield generators now correctly use power according to actual field strength. - Minimal shield dissipation rate now corresponds with 1 renwick field (changed from 10, which technically caused shields to always use max upkeep power ignoring field strength completely) --- code/modules/shieldgen/shield_gen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index b330b7cac9..7c91a08476 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -20,7 +20,7 @@ var/strengthen_rate = 0.2 var/max_strengthen_rate = 0.5 //the maximum rate that the generator can increase the average field strength var/dissipation_rate = 0.030 //the percentage of the shield strength that needs to be replaced each second - var/min_dissipation = 0.1 //will dissipate by at least this rate in renwicks per field tile (otherwise field would never dissipate completely as dissipation is a percentage) + var/min_dissipation = 0.01 //will dissipate by at least this rate in renwicks per field tile (otherwise field would never dissipate completely as dissipation is a percentage) var/powered = 0 var/check_powered = 1 var/obj/machinery/shield_capacitor/owned_capacitor From 3155f3070ff21ee159cf870be8d018e26b4e6f92 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 19 Nov 2014 12:34:50 +0100 Subject: [PATCH 2/8] Canister Logs Opening a non-empty canister now produces an admin message, not only a log note on the canister itself. --- code/game/machinery/atmoalter/canister.dm | 1 + .../machinery/atmoalter/portable_atmospherics.dm | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 40e04f0928..d8f67422a5 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -303,6 +303,7 @@ update_flag release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the [holding]
" else release_log += "Valve was opened by [usr] ([usr.ckey]), starting the transfer into the air
" + log_open() valve_open = !valve_open if (href_list["remove_tank"]) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 615bf17359..e82a617b6e 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -175,3 +175,16 @@ return ..() + +/obj/machinery/portable_atmospherics/proc/log_open() + if(air_contents.gas.len == 0) + return + + var/gases = "" + for(var/gas in air_contents.gas) + if(gases) + gases += ", [gas]" + else + gases = gas + log_admin("[usr] ([usr.ckey]) opened '[src.name]' containing [gases].") + message_admins("[usr] ([usr.ckey]) opened '[src.name]' containing [gases].") From 861c0c4caa123cba19229359c79e83417d492bb4 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 19 Nov 2014 14:49:42 +0100 Subject: [PATCH 3/8] Fixes #7061 --- maps/tgstation2.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 65d2725086..40a5802011 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -912,6 +912,7 @@ "arB" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area/shuttle/escape_pod3/station) "arC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/security_port) "arD" = (/obj/machinery/light,/obj/machinery/flasher/portable,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/security/warden) +"arE" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/shuttle/constructionsite/site) "arF" = (/obj/machinery/camera{c_tag = "Bar East"; network = list("SS13")},/obj/structure/flora/pottedplant{tag = "icon-plant-22"; icon_state = "plant-22"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "arG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/main) "arH" = (/turf/simulated/shuttle/wall{icon_state = "swall_s10"; dir = 2},/area/shuttle/escape_pod3/station) @@ -9450,7 +9451,6 @@ "dzN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area/djstation/solars) "dzO" = (/obj/structure/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/syndi,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/head/helmet/space/rig/syndi,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "dzP" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area/djstation/solars) -"dzQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/constructionsite/site) "dzR" = (/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "engineering_station_sensor"; pixel_x = -25; pixel_y = 8},/obj/machinery/atmospherics/pipe/simple/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/plating,/area/djstation) "dzS" = (/obj/machinery/camera{c_tag = "Research Outpost Expedition Airlock"; dir = 2; network = list("Research","SS13")},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) "dzT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/research_outpost/gearstore) @@ -11932,7 +11932,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnndnmdnidnkdnrdnsdnqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedkJdlwdltdlsdlsdluaaeaaaaaeaaaaaeaaaaaedkJdkJdkJdkJdkJdkJdkEdltdlrdlrdlrdltdkEdkJdkJdkJdkJdkJdkJaaeaaaaaeaaaaaeaaaaaedludlsdlsdltdkEdkJaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnndnmdnidnkdnkdnodnpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadkJdltdltdlsdlsdltdltaaeaaeaaeaaeaaeaaeaaeaaeaaeaaeaaedkJdkEdlAdlrdlrdlrdlAdkEdkJaaeaaeaaeaaeaaeaaeaaeaaeaaeaaeaaedltdltdlsdlsdltdltdkJaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadnndnmdnidnkdnidnjdnlaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdlsdlsdlsdlsdltdludludludludludludludludludludludltdltdltdlrdlrdlrdltdltdltdludludludludludludludludludludludltdlrdlrdlrdlrdluaaeaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzQdnfdnfdnfdnfdnfdnhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdlsdlsdlrdlsdlsdlsdlsdlsdlsdlsdlsdlsdlrdlrdlrdlsdlrdlrdlsdlrdlrdlrdlsdlsdlsdlrdlrdlrdlrdlsdlrdlsdlsdlrdlrdlrdlsdlrdlrdlrdlrdluaaeaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarEdnfdnfdnfdnfdnfdnhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdlsdlsdlrdlsdlsdlsdlsdlsdlsdlsdlsdlsdlrdlrdlrdlsdlrdlrdlsdlrdlrdlrdlsdlsdlsdlrdlrdlrdlrdlsdlrdlsdlsdlrdlrdlrdlsdlrdlrdlrdlrdluaaeaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdlsdlsdlsdlsdlsdlrdlrdlrdlrdlrdlrdlsdlrdlrdlrdlrdlsdlsdlrdlrdlrdlrdlsdlsdlrdlrdlsdlsdlsdlrdlrdlrdlrdlrdlrdlrdlrdlrdlrdlrdlrdluaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdlsdlsdlsdlsdltdludludludludludludludludludludludludltdlrdlrdlsdlsdlrdltdludludludludludludludludludludludludltdlrdlrdlrdlrdluaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaedltdltdltdltdltdltdnbdnbdnbdnbdncdnbdnednbdnednbdnednbdltdlrdlrdlrdlrdlsdltdmZdmZdnadnadnadnadnadnadnadnadmZdmZdltdltdlrdlrdltdltaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 05357f3850bb964bdfeab251bcbe520d5c831f51 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 19 Nov 2014 15:56:42 +0100 Subject: [PATCH 4/8] Fixed a bug that made it impossible for AIs to change air alarm sensor settings --- code/game/machinery/alarm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 1e53a770ab..80db82a0c3 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -987,7 +987,7 @@ table tr:first-child th:first-child { border: none;} var/list/selected = TLV[env] var/list/thresholds = list("lower bound", "low warning", "high warning", "upper bound") var/newval = input("Enter [thresholds[threshold]] for [env]", "Alarm triggers", selected[threshold]) as null|num - if (isnull(newval) || ..() || (locked && issilicon(usr))) + if (isnull(newval) || ..() || (locked && !issilicon(usr))) return if (newval<0) selected[threshold] = -1.0 From 77c883cc6db85889c0af9149e07cf9cc914b4db9 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Wed, 19 Nov 2014 21:35:34 -0500 Subject: [PATCH 5/8] Fixes missing icons for xenoarchaeology items EXCEPT for the energy guns. --- .../research/xenoarchaeology/finds/finds.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 4861a53ffc..64927f0614 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -146,6 +146,7 @@ "You wonder what the creator's mouth was shaped like")]." if(4) name = "statuette" + icon = 'icons/obj/xenoarchaeology.dmi' item_type = "statuette" icon_state = "statuette" additional_desc = "It depicts a [pick("small","ferocious","wild","pleasing","hulking")] \ @@ -154,6 +155,8 @@ if(prob(25)) new_item = new /obj/item/weapon/vampiric(src.loc) if(5) + name = "instrument" + icon = 'icons/obj/xenoarchaeology.dmi' item_type = "instrument" icon_state = "instrument" if(prob(30)) @@ -256,17 +259,17 @@ if(16) apply_prefix = 0 if(prob(25)) + icon = 'icons/obj/xenoarchaeology.dmi' item_type = "smooth green crystal" icon_state = "Green lump" else if(prob(33)) + icon = 'icons/obj/xenoarchaeology.dmi' item_type = "irregular purple crystal" icon_state = "Phazon" - else if(prob(50)) + else + icon = 'icons/obj/xenoarchaeology.dmi' item_type = "rough red crystal" icon_state = "changerock" - else - item_type = "smooth red crystal" - icon_state = "ore" additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.") apply_material_decorations = 0 @@ -285,8 +288,8 @@ if(18) new_item = new /obj/item/device/radio/beacon(src.loc) talkative = 0 - new_item.icon_state = "unknown[rand(1,4)]" new_item.icon = 'icons/obj/xenoarchaeology.dmi' + new_item.icon_state = "unknown[rand(1,4)]" new_item.desc = "" if(19) apply_prefix = 0 @@ -451,7 +454,7 @@ //robot remains apply_prefix = 0 item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]" - icon = 'icons/effects/blood.dmi' + icon = 'icons/mob/robots.dmi' icon_state = "remainsrobot" additional_desc = pick("Almost mistakeable for the remains of a modern cyborg.",\ "They are barely recognisable as anything other than a pile of waste metals.",\ From 0eed2c2fa66496d0f0f4600dd049510543ea8929 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Wed, 19 Nov 2014 22:42:58 -0500 Subject: [PATCH 6/8] Fixes the xenoarch eguns. This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm --- baystation12.dme | 1 + .../research/xenoarchaeology/finds/finds.dm | 8 +++--- .../xenoarchaeology/finds/finds_eguns.dm | 25 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 code/modules/research/xenoarchaeology/finds/finds_eguns.dm diff --git a/baystation12.dme b/baystation12.dme index 38e54e0b4e..c5d55626a1 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1287,6 +1287,7 @@ #include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_teleport.dm" #include "code\modules\research\xenoarchaeology\finds\finds.dm" #include "code\modules\research\xenoarchaeology\finds\finds_defines.dm" +#include "code\modules\research\xenoarchaeology\finds\finds_eguns.dm" #include "code\modules\research\xenoarchaeology\finds\finds_fossils.dm" #include "code\modules\research\xenoarchaeology\finds\finds_misc.dm" #include "code\modules\research\xenoarchaeology\finds\finds_special.dm" diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 64927f0614..3c2a3dd8e2 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -342,10 +342,10 @@ if(26) //energy gun var/spawn_type = pick(\ - /obj/item/weapon/gun/energy/laser/practice,\ - /obj/item/weapon/gun/energy/laser,\ - /obj/item/weapon/gun/energy/xray,\ - /obj/item/weapon/gun/energy/laser/captain) + /obj/item/weapon/gun/energy/laser/practice/xenoarch,\ + /obj/item/weapon/gun/energy/laser/xenoarch,\ + /obj/item/weapon/gun/energy/xray/xenoarch,\ + /obj/item/weapon/gun/energy/laser/captain/xenoarch) if(spawn_type) var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc) new_item = new_gun diff --git a/code/modules/research/xenoarchaeology/finds/finds_eguns.dm b/code/modules/research/xenoarchaeology/finds/finds_eguns.dm new file mode 100644 index 0000000000..95755e4d9c --- /dev/null +++ b/code/modules/research/xenoarchaeology/finds/finds_eguns.dm @@ -0,0 +1,25 @@ +//snowflake guns for xenoarch because you can't override the update_icon() proc inside the giant mess that is find creation +/obj/item/weapon/gun/energy/laser/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/practice/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/practice/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/xray/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return + +/obj/item/weapon/gun/energy/laser/captain/xenoarch + icon = 'icons/obj/xenoarchaeology.dmi' + update_icon() + return \ No newline at end of file From 72b0000f6aba8898bec9bb5b7ae1b59a4c3e619d Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 20 Nov 2014 00:41:43 -0500 Subject: [PATCH 7/8] Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of. --- code/modules/detectivework/evidence.dm | 2 +- .../research/xenoarchaeology/tools/tools_coresampler.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index b5f6dfa233..b416b250bf 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -77,7 +77,7 @@ /obj/item/weapon/evidencebag/attack_self(mob/user as mob) if(contents.len) - var/obj/item/I = stored_item + var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\ "You hear someone rustle around in a plastic bag, and remove something.") overlays.Cut() //remove the overlays diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index 344a6ccb22..af67103bff 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -79,7 +79,8 @@ //update the sample bag filled_bag.icon_state = "evidence" var/image/I = image("icon"=R, "layer"=FLOAT_LAYER) - filled_bag.underlays += I + filled_bag.overlays += I + filled_bag.overlays += "evidence" filled_bag.w_class = 1 user << "\blue You take a core sample of the [item_to_sample]." From 587f29e5d33cb985a67e4604c96bec465dbd54f7 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 20 Nov 2014 05:08:38 -0500 Subject: [PATCH 8/8] Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter. --- code/modules/paperwork/paper_bundle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 704afe76d5..23158e5a94 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -44,7 +44,7 @@ user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." user.drop_from_inventory(W) W.loc = src - else if(istype(W, /obj/item/weapon/flame/lighter)) + else if(istype(W, /obj/item/weapon/flame)) burnpaper(W, user) else if(istype(W, /obj/item/weapon/paper_bundle)) user.drop_from_inventory(W) @@ -69,7 +69,7 @@ return -/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/lighter/P, mob/user) +/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/P, mob/user) var/class = "" if(P.lit && !user.restrained())