From a38f6024447cc3e22a6898021ea7a46ccc5fd39f Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Mon, 26 Mar 2012 20:01:43 +0300 Subject: [PATCH 1/9] Added some asserts for FEA code, to help fix a runtime error. --- code/FEA/FEA_gas_mixture.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/FEA/FEA_gas_mixture.dm b/code/FEA/FEA_gas_mixture.dm index 72db42b060c..b712e736150 100644 --- a/code/FEA/FEA_gas_mixture.dm +++ b/code/FEA/FEA_gas_mixture.dm @@ -1030,6 +1030,8 @@ datum var/heat = conduction_coefficient*delta_temperature* \ (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) + ASSERT(self_heat_capacity != 0) // Trying to solve a runtime error - Abi79 + ASSERT(group_multiplier != 0) if(border_multiplier) temperature -= heat*border_multiplier/(self_heat_capacity*group_multiplier) else From 9b2c8d0928ae8867809c0f4bd9ce7ede9c7b41d5 Mon Sep 17 00:00:00 2001 From: pobiega Date: Tue, 27 Mar 2012 18:55:39 +0300 Subject: [PATCH 2/9] Update code/game/jobs/jobs.dm --- code/game/jobs/jobs.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c85f76f4aac..66d746b30e8 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -120,15 +120,15 @@ var/list/nonhuman_positions = list( /proc/GetRank(var/job) switch(job) - if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned") + if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor", "Chaplain") return 0 - if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist") + if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician") return 1 - if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner") + if("Quartermaster","Cargo Technician","Chemist", "Station Engineer","Roboticist", "Security Officer", "Forensic Technician","Detective", "Scientist","Shaft Miner", "Xenobiologist", "Plasma Researcher") return 2 if("Research Director","Chief Medical Officer","Head of Security","Chief Engineer","Warden") return 3 if("Captain","Head of Personnel","Wizard","MODE") return 4 else - world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER" + world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER" From a322e2ba7c9e5cdef4f8abb9b26be02c1bc2d789 Mon Sep 17 00:00:00 2001 From: cib Date: Tue, 27 Mar 2012 08:30:38 -0800 Subject: [PATCH 3/9] Fixed self-murdering with heavy blunt objects. --- code/game/objects/items/item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index c3f621de6b0..9cb9f2b2d4f 100755 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -274,7 +274,7 @@ mob/proc/flash_weak_pain() spawn unmoved = do_after(user, 4) sleep(4) - if( (!unmoved && !prob(70)) || get_dist(user, M) != 1) + if( (!unmoved && !prob(70)) || (get_dist(user, M) != 1 && user != M)) user.visible_message("\red [user.name] misses with \the [src]!") return From f772804da7411ebb0c14ea17d550121639024b3e Mon Sep 17 00:00:00 2001 From: Miniature Date: Wed, 28 Mar 2012 16:40:28 +1030 Subject: [PATCH 4/9] Made space heaters work (might break other stuff, maybe, I believe someone was working on making high pressures hurt people, no idea how that's being done so that might be an example) --- code/FEA/FEA_turf_tile.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index b7a9091e3f3..ec72ce98b23 100644 --- a/code/FEA/FEA_turf_tile.dm +++ b/code/FEA/FEA_turf_tile.dm @@ -27,6 +27,7 @@ turf // return movable_on_me.return_air() //Create gas mixture to hold data for passing + /* var/datum/gas_mixture/GM = new GM.oxygen = oxygen @@ -37,6 +38,8 @@ turf GM.temperature = temperature return GM + */ + return zone.air remove_air(amount as num) //First, ensure there is no movable shuttle or what not on tile that is taking over From 6f2726abb07fd03da16362b133415fc40f211d93 Mon Sep 17 00:00:00 2001 From: Miniature Date: Wed, 28 Mar 2012 23:50:15 +1030 Subject: [PATCH 5/9] Revert "Made space heaters work" This reverts commit f772804da7411ebb0c14ea17d550121639024b3e. Broke vent pumps a bit --- code/FEA/FEA_turf_tile.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index ec72ce98b23..b7a9091e3f3 100644 --- a/code/FEA/FEA_turf_tile.dm +++ b/code/FEA/FEA_turf_tile.dm @@ -27,7 +27,6 @@ turf // return movable_on_me.return_air() //Create gas mixture to hold data for passing - /* var/datum/gas_mixture/GM = new GM.oxygen = oxygen @@ -38,8 +37,6 @@ turf GM.temperature = temperature return GM - */ - return zone.air remove_air(amount as num) //First, ensure there is no movable shuttle or what not on tile that is taking over From eb8dc9a76f40055553bac10c615dc213c324073a Mon Sep 17 00:00:00 2001 From: pobiega Date: Wed, 28 Mar 2012 16:45:19 +0300 Subject: [PATCH 6/9] Stealth-admins can now hide from IRC-bot. IRC-bot can now detect admins on server. --- code/game/topic.dm | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/code/game/topic.dm b/code/game/topic.dm index 8d82f1d600c..70aa5cb2ea3 100644 --- a/code/game/topic.dm +++ b/code/game/topic.dm @@ -1,20 +1,7 @@ /world/Topic(T, addr, master, key) diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]" - if (T == "ping") - var/x = 1 - for (var/client/C) - x++ - return x - - else if(T == "players") - var/n = 0 - for(var/mob/M in world) - if(M.client) - n++ - return n - - else if (T == "status") + if (T == "status") var/list/s = list() s["version"] = game_version s["mode"] = master_mode @@ -24,11 +11,16 @@ s["ai"] = config.allow_ai s["host"] = host ? host : null s["players"] = list() + s["admins"] = 0 var/n = 0 - for(var/mob/M in world) - if(M.client) - s["player[n]"] = M.client.key - n++ + for(var/client/C) + n++ + if(C.holder && C.holder.level >= 0) //not retired admin + if(!C.stealth) //stealthmins dont count as admins + s["admins"] = 1 + s["player[n]"] = "[C.key]" + else + s["player[n]"] = "[C.fakekey]" s["players"] = n s["end"] = "#end" return list2params(s) \ No newline at end of file From fff274318411a40707ebc94f10cb3770f27b01f2 Mon Sep 17 00:00:00 2001 From: pobiega Date: Wed, 28 Mar 2012 16:47:13 +0300 Subject: [PATCH 7/9] Chaplain-duplicate GetRank fixed, now correctly returns rank 1. --- code/game/jobs/jobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 66d746b30e8..08ed0cc18e2 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -120,7 +120,7 @@ var/list/nonhuman_positions = list( /proc/GetRank(var/job) switch(job) - if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor", "Chaplain") + if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor") return 0 if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician") return 1 From 3f07ef38b376475d0cdc7cdb907b36ddb2192ed7 Mon Sep 17 00:00:00 2001 From: Pobiega Date: Wed, 28 Mar 2012 18:28:39 +0200 Subject: [PATCH 8/9] Added surgery crate to QM. Contains all surgery tools and requires access_medical to open. --- code/defines/obj/supplypacks.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 05feff44c2d..17192536ace 100755 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -567,6 +567,22 @@ containername = "APLU \"Ripley\" Circuit Crate" access = access_robotics group = "Robotics" + +/datum/supply_packs/surgery + name = "Surgery crate" + contains = list("/obj/item/weapon/cautery", + "/obj/item/weapon/surgicaldrill", + "/obj/item/weapon/hemostat", + "/obj/item/weapon/scalpel", + "/obj/item/weapon/surgical_tool/bonegel", + "/obj/item/weapon/retractor", + "/obj/item/weapon/surgical_tool/bonesetter", + "/obj/item/weapon/circular_saw") + cost = 20 + containertype = "/obj/structure/closet/crate/secure" + containername = "Surgery crate" + access = access_medical + group = "Medical / Science" /datum/supply_packs/robotics name = "Robotics Assembly Crate" From 3c3231d061b384dd335ed7452e1866c39d3fa3f5 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Wed, 28 Mar 2012 23:57:20 +0300 Subject: [PATCH 9/9] Updated admins.txt --- config/admins.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/admins.txt b/config/admins.txt index 790541e9862..4cb2a0656cf 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -6,16 +6,19 @@ cajoes - Game Admin cib - Game Master compactninja - Game Master dysthymia - Retired Admin -hawkv3 - Game Admin +doughnuts - Trial Admin +erthilo - Game Admin +hawkv3 - Game Master headswe - Game Master iaryni - Game Master masterofapples - Game Admin megacaesar - Game Admin miniature - Game Master -misterfox - Retired Admin +misterfox - Game Admin mloc - Game Master +ridley4 - Trial Admin skymarshal - Game Master spaceman96 - Game Admin strumpetplaya - Retired Admin tastyfish - Game Master -uristqwerty - Game Master \ No newline at end of file +uristqwerty - Game Master