From 10150208d18e3b1374d1127b74010d88ad2ea8e3 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:22:31 +0300 Subject: [PATCH 01/10] Fix for #3668. --- code/game/jobs/job/captain.dm | 5 ++++- code/game/jobs/job/civilian.dm | 7 ++++--- code/game/jobs/job/security.dm | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 38cb9d10be7..47bcef76158 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -35,6 +35,9 @@ L.imp_in = H L.implanted = 1 world << "[H.real_name] is the captain!" + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected return 1 get_access() @@ -83,4 +86,4 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - return 1 + return 1 \ No newline at end of file diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 8d9e0875dc9..ffd32b93721 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -360,6 +360,7 @@ var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 - return 1 - - + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected + return 1 \ No newline at end of file diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index dd04b9cbac7..2a163fc2c8f 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -42,6 +42,9 @@ var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected return 1 @@ -162,4 +165,4 @@ else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) - return 1 + return 1 \ No newline at end of file From 3dd5b22ae709e566de0cb8c233bb8eaf7f518ebb Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:24:25 +0300 Subject: [PATCH 02/10] Fix for #3662. --- code/modules/mob/living/silicon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 4dac67e8852..7c63628ced4 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -4,7 +4,7 @@ if (ending == "?") return "queries, \"[text]\""; else if (ending == "!") - return "declares, \"[copytext(text, 1, length(text))]\""; + return "declares, \"[text]\""; return "states, \"[text]\""; From 6b5b28bc0b7f7720f23d74e83d44b17579e83688 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:30:48 +0300 Subject: [PATCH 03/10] Fix for #3655. --- maps/tgstation2.dmm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index b9974f6a5b3..9d0db94081d 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -9184,7 +9184,7 @@ "duF" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/machinery/light/small{dir = 4},/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/latex,/obj/machinery/camera{c_tag = "Research Outpost Hallway Starboard"; dir = 8; network = list("Research","SS13")},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/research_outpost/hallway) "duG" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway) "duH" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "whitebluecorner"},/area/research_outpost/hallway) -"duI" = (/obj/machinery/door/airlock/research{name = "Anomalous Materials"; req_access_txt = "65"},/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.6; name = "Firelock North"},/obj/machinery/door/firedoor/border_only{layer = 2.6; name = "\improper Firelock South"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) +"duI" = (/obj/machinery/door/airlock/research{name = "Anomalous Materials"; req_access_txt = "65"},/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.6; name = "Firelock North"},/obj/machinery/door/firedoor/border_only{layer = 2.6; name = "\improper Firelock South"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) "duJ" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/power/emitter{anchored = 1; state = 2},/obj/structure/cable,/turf/simulated/floor/plating{dir = 5; icon_state = "warnplate"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/anomaly) "duK" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/turf/simulated/floor{dir = 4; icon_state = "whitered"},/area/research_outpost/anomaly) "duL" = (/obj/machinery/door/window/westleft{dir = 1; name = "Spectroscopy"; req_access_txt = "65"},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/anomaly) @@ -10172,6 +10172,7 @@ "dNF" = (/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "vox_east_vent"; exterior_door_tag = "vox_northeast_lock"; frequency = 1331; id_tag = "vox_east_control"; interior_door_tag = "vox_southeast_lock"; pixel_x = -24; req_access_txt = "150"; sensor_tag = "vox_east_sensor"},/turf/simulated/shuttle/plating,/area/shuttle/vox/station) "dNG" = (/obj/item/clothing/head/collectable/petehat{desc = "It smells faintly of reptile."; name = "fancy leader hat"},/turf/simulated/shuttle/floor{icon_state = "floor4"; oxygen = 0},/area/shuttle/vox/station) "dNH" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/modkit/tajaran,/turf/simulated/floor/plating,/area/engine/engineering) +"dNI" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/research_outpost/anomaly) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11256,7 +11257,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedpkdoedoedoedoedoedoedpkdpkdoedoedoedoedpkdpkdpkdpkdoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdoeaaaaaaaaaaaaaaaaaaaaaaaaaaadoSdpDdpndpEdpFdpGdpHdpIdpJdoTdpKdpKdpKdpKdpLdpvdpMdpNdpOdpddpddpddpddpPdpQdpRdpRdpRdpRdpRdBAdzTdAKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadpVdpWdpVaaaaaaaaaaaaaaadoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedoedpkdoedoedoedpkdpkdoedpkdpkdpkdoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdoedpkaaaaaaaaaaaaaaaaaaaaaaaadoSdoTdpXdpYdpYdpZdqadqbdqcdqddqedqfdqgdqhdqidqjdqkdqldqmdpddqndqodpddqpdqqdqrdqsdqtdqudqvdqwdqxdzkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadqzdqAdqzaafaaaaaaaaadoedoedoedoedoedoedoedoedoedoedoedoedpkdpkdpkdpkdpkdpkdoedoedoedoedoedoedoedpkdpkdpkdpkdpkdoedoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkaaaaaaaaaaaaaaaaaaaaaaaadoSdoTdpXdqBdqBdpZdqadqCdqDdoTdqEdqedqFdqGdqHdqIdqJdqKdqLdqMdqNdqOdqPdqQdqRdpRdqSdqTdqUdqVdqWdqXdzkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadqYdqZdradrbaafaaaaaadoedoedoedoedoedoedoedpkdoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkaaaaaaaaaaaaaaaaaaaaadogdrcdpDdrddpEdredrfdrgdrhdridoTdrjdqFdrkdrldrmdrndrndrndrodrndrndrndrndrpdrqdpRdrrdqTdrsdrtdrudqxdzkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadqYdqZdradrbaafaaaaaadoedoedoedoedoedoedoedpkdoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkaaaaaaaaaaaaaaaaaaaaadogdrcdpDdrddpEdredrfdrgdrhdridoTdrjdqFdrkdrldrmdrndNIdrndrodrndrndrndrndrpdrqdpRdrrdqTdrsdrtdrudqxdzkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadrvdrwdrwdrxdrydrzdqzaafaaaaaadoedoedoedoedpkdpkdpkdoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkaafdrAdrBdoCdoCdoCdrCdrDdoTdrEdrFdrGdpodrHdrIdrJdoTdrKdrLdrMdrNdrOdrPdrQdrRdrSdrTdrUdrVdrndrWdrXdpRdrYdrZdsadrtdpRdCRdDwaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadsddsedsfdsgdshdsidsjaafaafdpkdpkdoedoedpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdskdskdskaafdsldrDaafaafaafaafaafdoTdoTdoTdoTdoTdoTdsmdsndoTdpKdpKdsodspdsqdrndsrdssdrSdstdsudsvdrndswdsxdsydszdsAdsBdsCdpRdsDdsEaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofaaadofdofdofdofdofaaadofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadsFdrwdrwdsGdsHdrzdsIdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdpkdskdskdskaaaaaadoSdsJdsJdsJdsJdsJdsJdsJdpddsKdoOdsLdsMdsNdsOdsPdsQdsRdsSdsTdsUdrndsVdsWdsXdsYdsZdtadtbdtcdtddtedtedtedtfdtgdthdtidtjdtjdtkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadofdofdofdofdofaaadofdofdofdofdofaaadofdofdofdofdofaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From d13f9e617b54b96a51326c506d183a209bf8a6e0 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:38:21 +0300 Subject: [PATCH 04/10] Fix for #3666. --- code/game/objects/items/devices/modkit.dm | 47 ++++++++++++++++++++++ code/modules/clothing/spacesuits/rig.dm | 30 -------------- icons/obj/device.dmi | Bin 18563 -> 19923 bytes maps/tgstation2.dmm | 4 +- 4 files changed, 49 insertions(+), 32 deletions(-) create mode 100644 code/game/objects/items/devices/modkit.dm diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm new file mode 100644 index 00000000000..a7c221aa58f --- /dev/null +++ b/code/game/objects/items/devices/modkit.dm @@ -0,0 +1,47 @@ +#define MODKIT_HELMET 1 +#define MODKIT_SUIT 2 +#define MODKIT_FULL 3 + +/obj/item/device/modkit + name = "hardsuit modification kit" + desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user." + icon_state = "modkit" + var/parts = MODKIT_FULL + var/from_helmet = /obj/item/clothing/head/helmet/space/rig + var/from_suit = /obj/item/clothing/suit/space/rig + var/to_helmet = /obj/item/clothing/head/cardborg + var/to_suit = /obj/item/clothing/suit/cardborg + +/obj/item/device/modkit/afterattack(obj/O, mob/user as mob) + var/flag + var/to_type + if(istype(O,from_helmet)) + flag = MODKIT_HELMET + to_type = to_helmet + else if(istype(O,from_suit)) + flag = MODKIT_SUIT + to_type = to_suit + else + return + if(!(parts & flag)) + user << "This kit has no parts for this modification left." + return + if(istype(O,to_type)) + user << "[O] is already modified." + return + if(!isturf(O.loc)) + user << "[O] must be safely placed on the ground for modification." + return + playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) + var/N = new to_type(O.loc) + user.visible_message("\red [user] opens \the [src] and modifies \the [O] into \the [N].","\red You open \the [src] and modify \the [O] into \the [N].") + del(O) + parts &= ~flag + if(!parts) + del(src) + +/obj/item/device/modkit/tajaran + name = "tajara hardsuit modification kit" + desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajara." + to_helmet = /obj/item/clothing/head/helmet/space/rig/tajara + to_suit = /obj/item/clothing/suit/space/rig/tajara \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index b075d929167..b4e7318c138 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -1,33 +1,3 @@ -//Species modification item. - -/obj/item/weapon/modkit/tajaran - name = "hardsuit modification kit" - desc = "A kit containing all the needed tools and parts to modify a hardsuit for another species. This one looks like it's meant for Tajara." - icon = 'icons/obj/custom_items.dmi' - icon_state = "royce_kit" - -/obj/item/clothing/head/helmet/space/rig/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/modkit/tajaran)) - user.drop_item() - playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user." - new /obj/item/clothing/head/helmet/space/rig/tajara(user.loc) - del(I) - del(src) - return - ..() - -/obj/item/clothing/suit/space/rig/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/modkit/tajaran)) - user.drop_item() - playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\red You painstakingly modify [src] to make it more suitable for a Tajaran user." - new /obj/item/clothing/suit/space/rig/tajara(user.loc) - del(I) - del(src) - return - ..() - //Regular rig suits /obj/item/clothing/head/helmet/space/rig name = "engineering hardsuit helmet" diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 003bf5c9f10455108b282a68478ea1e8ad37fafa..271b96484f29f533c42651c530ff7a709a4c97ef 100644 GIT binary patch literal 19923 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 KelF{r5}E)9=`y7N literal 18563 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 Date: Fri, 13 Sep 2013 19:40:09 +0300 Subject: [PATCH 05/10] Iconfix. --- code/modules/recycling/sortingmachinery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 7f3dea0f7a4..9c7bc060297 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -157,7 +157,7 @@ /obj/item/device/destTagger name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." - icon_state = "forensic0" + icon_state = "forensic0-old" var/currTag = 0 //The whole system for the sorttype var is determined based on the order of this list, //disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude From d8ad339fd82c79d759ae48238ab16c300cc07574 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:41:23 +0300 Subject: [PATCH 06/10] Fix for throwing damage. --- code/game/objects/items/weapons/stunbaton.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5d6bd479c47..5637f47f983 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -98,6 +98,7 @@ add_fingerprint(user) /obj/item/weapon/melee/baton/throw_impact(atom/hit_atom) + . = ..() if (prob(50)) if(istype(hit_atom, /mob/living)) var/mob/living/carbon/human/H = hit_atom @@ -116,9 +117,6 @@ H.attack_log += "\[[time_stamp()]\] Stunned by thrown [src.name] last touched by ([src.fingerprintslast])" log_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])" ) - return - return ..() - /obj/item/weapon/melee/baton/emp_act(severity) switch(severity) if(1) From d658b256e32a5e12404a3543687cbcc6b61f649c Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:42:54 +0300 Subject: [PATCH 07/10] Fix for announcing gamemode ties. --- code/controllers/voting.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 9bb2197e6e8..d03aa546f92 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -119,8 +119,8 @@ datum/controller/vote if(winners.len > 1) if(mode != "gamemode" || ticker.hide_mode == 0) // Here we are making sure we don't announce potential game modes text = "Vote Tied Between:\n" - for(var/option in winners) - text += "\t[option]\n" + for(var/option in winners) + text += "\t[option]\n" . = pick(winners) for(var/key in current_votes) From d5f20aa87459dbd9a20721a48df8f8797e7ba9b8 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:43:59 +0300 Subject: [PATCH 08/10] Colour fix. --- code/modules/paperwork/stamps.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 644eaf646b2..f7046974d97 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -42,7 +42,7 @@ /obj/item/weapon/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" - color = "medical" + color = "cmo" /obj/item/weapon/stamp/denied name = "\improper DENIED rubber stamp" From 91068e31c8b31beb7ddfdf5aae733ed11785966e Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:45:22 +0300 Subject: [PATCH 09/10] Falling fix. --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b92bd7e7067..6ecc7b6dddf 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -202,7 +202,7 @@ if(getBrainLoss() >= 50) if(10 <= rn && rn <= 12) if(!lying) src << "\red Your legs won't respond properly, you fall down." - lying = 1 + resting = 1 proc/handle_stasis_bag() // Handle side effects from stasis bag From 9eaf5cf273a38f199eea31b44659169c08f04722 Mon Sep 17 00:00:00 2001 From: Segrain Date: Fri, 13 Sep 2013 19:46:45 +0300 Subject: [PATCH 10/10] Smallfix. --- code/game/machinery/doors/airlock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 424e94eee07..f4ea117c397 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1150,7 +1150,7 @@ About the new airlock wires panel: if(src.isElectrified()) if(src.shock(user, 75)) return - if(istype(C, /obj/item/device/detective_scanner)) + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) return src.add_fingerprint(user)