From 3e25608535118430a1cb1d70feaf2437c4970061 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sat, 18 Jun 2016 22:08:59 -0400 Subject: [PATCH 01/28] Engineer Workboots --- code/game/jobs/job/engineering.dm | 4 ++-- code/game/machinery/vending.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 6 +++--- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 6 ++++++ icons/mob/feet.dmi | Bin 31523 -> 31874 bytes icons/obj/clothing/shoes.dmi | Bin 18801 -> 19050 bytes 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 7427ad57d23..5e30b056f51 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -63,7 +63,7 @@ if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) - H.equip_or_collect(new /obj/item/clothing/shoes/orange(H), slot_shoes) + H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) @@ -128,7 +128,7 @@ if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/rank/mechanic(H), slot_w_uniform) - H.equip_or_collect(new /obj/item/clothing/shoes/orange(H), slot_shoes) + H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index e022e0c6a4b..50bb56afdb1 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1114,7 +1114,7 @@ icon_state = "engi" icon_deny = "engi-deny" req_access_txt = "11" - products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4, + products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/workboots = 4,/obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/weapon/screwdriver = 12, /obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/stock_parts/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8, diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index dfeb734391d..54ff77582a4 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -195,9 +195,9 @@ new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/under/rank/engineer(src) - new /obj/item/clothing/shoes/orange(src) - new /obj/item/clothing/shoes/orange(src) - new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/workboots(src) + new /obj/item/clothing/shoes/workboots(src) + new /obj/item/clothing/shoes/workboots(src) new /obj/item/clothing/head/hardhat(src) new /obj/item/clothing/head/hardhat(src) new /obj/item/clothing/head/hardhat(src) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 4612979c125..5e79391cd40 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -159,7 +159,7 @@ corpseradio = /obj/item/device/radio/headset/headset_eng corpseuniform = /obj/item/clothing/under/rank/engineer corpseback = /obj/item/weapon/storage/backpack/industrial - corpseshoes = /obj/item/clothing/shoes/orange + corpseshoes = /obj/item/clothing/shoes/workboots corpsebelt = /obj/item/weapon/storage/belt/utility/full corpsegloves = /obj/item/clothing/gloves/color/yellow corpsehelmet = /obj/item/clothing/head/hardhat diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index babeb811a37..72d00a4abf1 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -99,6 +99,12 @@ item_color = "jacksandal" species_restricted = null +/obj/item/clothing/shoes/workboots + name = "work boots" + desc = "Thick-soled boots for industrial work environments." + can_cut_open = 1 + icon_state = "workboots" + /obj/item/clothing/shoes/cult name = "boots" desc = "A pair of boots worn by the followers of Nar-Sie." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 3390f7ec700b96058c19616d7e9d8255f22d712c..d74f99cbb78c8049d3acc2f0f74a4235bea05e66 100644 GIT binary patch delta 12885 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 cQ{2Ph{U|$DB?0eQlJP7_K#{F4Yt;UC$fsXv2 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 literal 18801 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 Date: Sat, 18 Jun 2016 22:17:16 -0400 Subject: [PATCH 02/28] Boots for Atmos Techs! --- code/game/jobs/job/engineering.dm | 2 +- .../objects/structures/crates_lockers/closets/wardrobe.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 5e30b056f51..1c736d89609 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -98,7 +98,7 @@ if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform) - H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/atmos(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt) if(H.backbag == 1) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 54ff77582a4..0cccd860b04 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -173,9 +173,9 @@ new /obj/item/clothing/under/rank/atmospheric_technician(src) new /obj/item/clothing/under/rank/atmospheric_technician(src) new /obj/item/clothing/under/rank/atmospheric_technician(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/workboots(src) + new /obj/item/clothing/shoes/workboots(src) + new /obj/item/clothing/shoes/workboots(src) new /obj/item/clothing/head/hardhat/red(src) new /obj/item/clothing/head/hardhat/red(src) new /obj/item/clothing/head/hardhat/red(src) From 0f96db96ba0a5fe53ab16b6e9c7c3d0a449ddfd9 Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 20 Jun 2016 02:07:07 -0700 Subject: [PATCH 03/28] Changes Bee Briefcase to not be suicide briefcase - Traitors attempting to open a bee briefcase without first having injected it with their blood, will now be stopped from doing so. Instead, they will get a message telling them how to open it safely. - Non-traitors can still open the briefcase as normal - resulting in at least 5 angry bees that will surely kill them. --- code/game/objects/items/weapons/bee_briefcase.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/bee_briefcase.dm b/code/game/objects/items/weapons/bee_briefcase.dm index 5c3e9afff5d..e489bbeb189 100644 --- a/code/game/objects/items/weapons/bee_briefcase.dm +++ b/code/game/objects/items/weapons/bee_briefcase.dm @@ -27,7 +27,6 @@ /obj/item/weapon/bee_briefcase/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/syringe)) - var/obj/item/weapon/reagent_containers/syringe/S = I if(!bees_left) to_chat(user, "The briefcase is empty, so there is no point in injecting something into it.") @@ -46,7 +45,6 @@ to_chat(user, "The buzzing inside the briefcase swells momentarily, then returns to normal. Guess it was too cramped...") S.reagents.clear_reagents() S.update_icon() - else if(istype(I, /obj/item/weapon/plantspray)) var/obj/item/weapon/plantspray/PS = I user.drop_item(PS) @@ -56,7 +54,9 @@ qdel(PS) /obj/item/weapon/bee_briefcase/attack_self(mob/user as mob) - if(!bees_left) + if (!blood_list.len && user.mind && user.mind.special_role) + to_chat(user, "You must inject some of your blood into this briefcase, using a syringe, to train the bees not to attack you. Only then can the briefcase be opened.") + else if(!bees_left) to_chat(user, "The lack of all and any bees at this event has been somewhat of a let-down...") return else From c9240f216eb5a0d933335953645d44d59efac37e Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 20 Jun 2016 22:17:17 -0700 Subject: [PATCH 04/28] Changed to DZD's suggestion --- code/game/objects/items/weapons/bee_briefcase.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/bee_briefcase.dm b/code/game/objects/items/weapons/bee_briefcase.dm index e489bbeb189..665ad549bd2 100644 --- a/code/game/objects/items/weapons/bee_briefcase.dm +++ b/code/game/objects/items/weapons/bee_briefcase.dm @@ -2,6 +2,7 @@ /obj/item/weapon/bee_briefcase name = "briefcase" desc = "This briefcase has easy-release clasps and smells vaguely of honey and blood..." + description_antag = "A briefcase filled with deadly bees, you should inject this with a syringe of your own blood before opening it." icon = 'icons/obj/storage.dmi' icon_state = "briefcase" item_state = "briefcase" @@ -54,9 +55,7 @@ qdel(PS) /obj/item/weapon/bee_briefcase/attack_self(mob/user as mob) - if (!blood_list.len && user.mind && user.mind.special_role) - to_chat(user, "You must inject some of your blood into this briefcase, using a syringe, to train the bees not to attack you. Only then can the briefcase be opened.") - else if(!bees_left) + if(!bees_left) to_chat(user, "The lack of all and any bees at this event has been somewhat of a let-down...") return else From 10fd26bc9f9a7e1e2f04576a4f6c268b7cf54cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Tue, 21 Jun 2016 16:04:43 +0200 Subject: [PATCH 05/28] Mining drone fix. --- code/modules/mining/equipment_locker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index ee84c1a5864..0a4973808d7 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -730,13 +730,13 @@ if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding && !stat) - if(AIStatus == AI_ON) + if(FindTarget())//if the bot has anything to shoot at, to prevent combat repair cheesing to_chat(user, "[src] is moving around too much to repair!") return if(maxHealth == health) to_chat(user, "[src] is at full integrity.") else - health += 10 + adjustHealth(-10)//actually repairs the bot, not damages it to_chat(user, "You repair some of the armor on [src].") return if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner)) From b0ef74825d8ec109b43f5db33ca942bdfeb8e503 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 21 Jun 2016 15:54:33 -0400 Subject: [PATCH 06/28] Automatic changelog generation for PR #4730 --- html/changelogs/AutoChangeLog-pr-4730.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4730.yml diff --git a/html/changelogs/AutoChangeLog-pr-4730.yml b/html/changelogs/AutoChangeLog-pr-4730.yml new file mode 100644 index 00000000000..6b220ee5d16 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4730.yml @@ -0,0 +1,4 @@ +author: Kyep +delete-after: True +changes: + - bugfix: "Safeties added to Bee Briefcase, to prevent it accidentally killing traitors get it in bundles and crates." From 3bbd041191d44e4004b0feca483b27ceb6f61fe4 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 21 Jun 2016 16:54:52 -0400 Subject: [PATCH 07/28] Fixes bad pixel in the sandstone door sprites (#4741) --- icons/obj/doors/Doorsand.dmi | Bin 17909 -> 17917 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/doors/Doorsand.dmi b/icons/obj/doors/Doorsand.dmi index 0cd24efc42ddbdf3c2f5484ca730dc9f4f5f814a..9c905d25442ae1fbf4c16ec9b49cd8911ceaef19 100644 GIT binary patch literal 17917 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 Date: Tue, 21 Jun 2016 16:55:15 -0400 Subject: [PATCH 08/28] Makes cryo tube, sleeper, and body scanner eject dropped items (#4738) --- code/game/machinery/Sleeper.dm | 16 +++++++++------- code/game/machinery/adv_med.dm | 18 ++++++++++-------- code/game/machinery/cryo.dm | 9 ++++++--- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 31ad9f145ee..5b796d5770d 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -520,15 +520,17 @@ /obj/machinery/sleeper/proc/go_out() if(filtering) toggle_filter() - if(!src.occupant) + if(!occupant) return - if(src.occupant.client) - src.occupant.client.eye = src.occupant.client.mob - src.occupant.client.perspective = MOB_PERSPECTIVE - src.occupant.forceMove(src.loc) - src.occupant = null + if(occupant.client) + occupant.client.eye = occupant.client.mob + occupant.client.perspective = MOB_PERSPECTIVE + occupant.forceMove(loc) + occupant = null icon_state = "sleeper-open" - return + // eject trash the occupant dropped + for(var/atom/movable/A in contents - component_parts - list(beaker)) + A.forceMove(loc) /obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount) if (!(chemical in injection_chems)) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 897e3ee51c8..67f348a605b 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -157,15 +157,17 @@ add_fingerprint(usr) /obj/machinery/bodyscanner/proc/go_out() - if ((!( src.occupant ) || src.locked)) + if(!occupant || locked) return - if (src.occupant.client) - src.occupant.client.eye = src.occupant.client.mob - src.occupant.client.perspective = MOB_PERSPECTIVE - src.occupant.loc = src.loc - src.occupant = null - src.icon_state = "body_scanner_0" - return + if(occupant.client) + occupant.client.eye = occupant.client.mob + occupant.client.perspective = MOB_PERSPECTIVE + occupant.forceMove(loc) + occupant = null + icon_state = "body_scanner_0" + // eject trash the occupant dropped + for(var/atom/movable/A in contents - component_parts) + A.forceMove(loc) /obj/machinery/bodyscanner/ex_act(severity) switch(severity) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6a1f0721253..e469f389ff3 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -411,9 +411,9 @@ air_update_turf() /obj/machinery/atmospherics/unary/cryo_cell/proc/go_out() - if(!( occupant )) + if(!occupant) return - if (occupant.client) + if(occupant.client) occupant.client.eye = occupant.client.mob occupant.client.perspective = MOB_PERSPECTIVE occupant.forceMove(get_step(loc, SOUTH)) //this doesn't account for walls or anything, but i don't forsee that being a problem. @@ -421,7 +421,10 @@ occupant.bodytemperature = 261 occupant = null update_icon() - return + // eject trash the occupant dropped + for(var/atom/movable/A in contents - component_parts - list(beaker)) + A.forceMove(get_step(loc, SOUTH)) + /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (!istype(M)) to_chat(usr, "\red The cryo cell cannot handle such a lifeform!") From b23ec5c8c13fb3243f915041963ad760837d1ff9 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 21 Jun 2016 16:55:18 -0400 Subject: [PATCH 09/28] Automatic changelog generation for PR #4738 --- html/changelogs/AutoChangeLog-pr-4738.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4738.yml diff --git a/html/changelogs/AutoChangeLog-pr-4738.yml b/html/changelogs/AutoChangeLog-pr-4738.yml new file mode 100644 index 00000000000..d93f5be8056 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4738.yml @@ -0,0 +1,4 @@ +author: Tastyfish +delete-after: True +changes: + - bugfix: "Cryo tubes, sleepers, and body scanners now eject random items the occupant dropped, upon the occupant being ejected." From 694429e4aad478b5f4cf2c44d98b3e22ea329949 Mon Sep 17 00:00:00 2001 From: DaveTheHeadcrab Date: Tue, 21 Jun 2016 16:56:01 -0400 Subject: [PATCH 10/28] Fixed #4720 (#4737) * Scanner Fix * Allows partial searches --- code/modules/detective_work/scanner.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index e959df37989..3a5e19169c0 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -24,33 +24,33 @@ search = lowertext(search) var/name - var/fingerprint - var/dna + var/fingerprint = "FINGERPRINT NOT FOUND" + var/dna = "BLOOD DNA NOT FOUND" // I really, really wish I didn't have to split this into two seperate loops. But the datacore is awful. for (var/record in data_core.general) var/datum/data/record/S = record - if(search == lowertext(S.fields["fingerprint"]) || search == lowertext(S.fields["name"])) + if(S && (search == lowertext(S.fields["fingerprint"]) || search == lowertext(S.fields["name"]))) name = S.fields["name"] fingerprint = S.fields["fingerprint"] continue for (var/record in data_core.medical) var/datum/data/record/M = record - if (search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) + if (M && ( search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) ) dna = M.fields["b_dna"] - if(!fingerprint) // We have searched by DNA, and do not have the relevant information from the security records. + if(fingerprint == "FINGERPRINT NOT FOUND") // We have searched by DNA, and do not have the relevant information from the fingerprint records. name = M.fields["name"] for (var/gen_record in data_core.general) var/datum/data/record/S = gen_record - if(name == S.fields["name"]) + if(S && (name == S.fields["name"])) fingerprint = S.fields["fingerprint"] continue continue - if(name && fingerprint && dna) + if(name) to_chat(user, "Match found in station records: [name]
\ Fingerprint: [fingerprint]
\ Blood DNA: [dna]") @@ -220,4 +220,4 @@ CRASH("[src] \ref[src] is adding a log when it was never put in scanning mode!") /proc/get_timestamp() - return time2text(world.time + 432000, ":ss") \ No newline at end of file + return time2text(world.time + 432000, ":ss") From 2a9041fdd8382c7f1f285d56b10c55c43f2e1b61 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 21 Jun 2016 16:56:02 -0400 Subject: [PATCH 11/28] Automatic changelog generation for PR #4737 --- html/changelogs/AutoChangeLog-pr-4737.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4737.yml diff --git a/html/changelogs/AutoChangeLog-pr-4737.yml b/html/changelogs/AutoChangeLog-pr-4737.yml new file mode 100644 index 00000000000..0d9306790af --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4737.yml @@ -0,0 +1,4 @@ +author: DaveTheHeadcrab +delete-after: True +changes: + - bugfix: "Fixes the scanner's search functionality." From 8af56d111ce7f55e42907c75642198ef8237b0e4 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Tue, 21 Jun 2016 21:56:11 +0100 Subject: [PATCH 12/28] Makes jump actually jump (#4735) * Makes jump actually jump fixes #4707 sets flying to 1 for the duration of the jump. Means you can jump over anything you can fly over. Also fixes a bug with flying that could leave you visually floating (pixel_y = 5) when you stop flying * better fix --- code/game/dna/genes/goon_powers.dm | 3 +++ code/modules/mob/living/carbon/human/life.dm | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 3a6d5066ab3..c50c04860cf 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -410,13 +410,16 @@ "You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.") return 0 var/prevLayer = usr.layer + var/prevFlying = usr.flying usr.layer = 9 + usr.flying = 1 for(var/i=0, i<10, i++) step(usr, usr.dir) if(i < 5) usr.pixel_y += 8 else usr.pixel_y -= 8 sleep(1) + usr.flying = prevFlying if (FAT in usr.mutations && prob(66)) usr.visible_message("\red [usr.name] crashes due to their heavy weight!") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d96dd018f2a..c7c20904da4 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -900,13 +900,9 @@ else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs ear_damage = max(ear_damage - 0.05, 0) - if(flying) - spawn() - animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING) - spawn(10) - if(flying) - animate(src, pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING) + animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING) + animate(pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING) // If you're dirty, your gloves will become dirty, too. if(gloves && germ_level > gloves.germ_level && prob(10)) From 2e5cfcc2f79300ada83084639b0fa3cddaa61c2a Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 21 Jun 2016 16:56:13 -0400 Subject: [PATCH 13/28] Automatic changelog generation for PR #4735 --- html/changelogs/AutoChangeLog-pr-4735.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4735.yml diff --git a/html/changelogs/AutoChangeLog-pr-4735.yml b/html/changelogs/AutoChangeLog-pr-4735.yml new file mode 100644 index 00000000000..87d489e9e19 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4735.yml @@ -0,0 +1,4 @@ +author: VampyrBytes +delete-after: True +changes: + - rscadd: "Leap genetics ability lets you jump over things" From 876ab1cdd8fd846f74fca11641b8b3cff46c47a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Tue, 21 Jun 2016 22:56:31 +0200 Subject: [PATCH 14/28] Makes the medical HUD overlay smoother (#4726) * Smoother medical hud * Port's /tg/'s neat flashy thingies. --- code/game/data_huds.dm | 44 ++++++++++++++++++++++++++++++----------- icons/mob/hud.dmi | Bin 12734 -> 13302 bytes 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index b308d996de9..936e5ac0001 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -70,20 +70,40 @@ switch(health) if(100 to INFINITY) return "health100" - if(70 to 100) - return "health80" - if(50 to 70) - return "health60" - if(30 to 50) - return "health40" - if(18 to 30) - return "health25" - if(5 to 18) - return "health10" - if(1 to 5) + if(93 to 100) + return "health93" + if(86 to 93) + return "health86" + if(78 to 86) + return "health78" + if(71 to 78) + return "health71" + if(64 to 71) + return "health64" + if(56 to 64) + return "health56" + if(49 to 56) + return "health49" + if(42 to 49) + return "health42" + if(35 to 42) + return "health35" + if(28 to 35) + return "health28" + if(21 to 28) + return "health21" + if(14 to 21) + return "health14" + if(7 to 14) + return "health7" + if(1 to 7) return "health1" - if(-99 to 0) + if(-50 to 1) return "health0" + if(-85 to -50) + return "health-50" + if(-99 to -85) + return "health-85" else return "health-100" return "0" diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index c5115b3cbc520182fef2891072f28bee770393d0..a6dd62c013e53628682526ab0504a09ec72c4baa 100644 GIT binary patch literal 13302 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 Date: Tue, 21 Jun 2016 16:56:32 -0400 Subject: [PATCH 15/28] Automatic changelog generation for PR #4726 --- html/changelogs/AutoChangeLog-pr-4726.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4726.yml diff --git a/html/changelogs/AutoChangeLog-pr-4726.yml b/html/changelogs/AutoChangeLog-pr-4726.yml new file mode 100644 index 00000000000..0a4dc110a5c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4726.yml @@ -0,0 +1,4 @@ +author: FlattestGuitar +delete-after: True +changes: + - tweak: "The medical HUD will now be a bit smoother. Neat." From c1256497e19fb13a44c8f305b92d0f17a2882a45 Mon Sep 17 00:00:00 2001 From: LittleBigKid2000 Date: Tue, 21 Jun 2016 16:56:42 -0400 Subject: [PATCH 16/28] Vox raiders will now have Vox breath masks instead of the regular ones (#4725) You know, the Vox breath masks that Vox crew members use --- code/modules/admin/verbs/vox_raiders.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index b2cc9336bf5..4d42358aee8 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -48,7 +48,7 @@ var/global/vox_tick = 1 equip_to_slot_or_del(new /obj/item/weapon/circular_saw(src), slot_l_store) equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/medical, slot_r_hand) - equip_to_slot_or_del(new /obj/item/clothing/mask/breath(src), slot_wear_mask) + equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask) equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(src), slot_back) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store) From 7c7ebeea9e6157d2730c025e07997521d2bcf894 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Wed, 22 Jun 2016 04:35:37 -0400 Subject: [PATCH 17/28] Fixes changelog message for #4730 (#4746) --- html/changelogs/AutoChangeLog-pr-4730.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/AutoChangeLog-pr-4730.yml b/html/changelogs/AutoChangeLog-pr-4730.yml index 6b220ee5d16..da4a9685281 100644 --- a/html/changelogs/AutoChangeLog-pr-4730.yml +++ b/html/changelogs/AutoChangeLog-pr-4730.yml @@ -1,4 +1,4 @@ author: Kyep delete-after: True changes: - - bugfix: "Safeties added to Bee Briefcase, to prevent it accidentally killing traitors get it in bundles and crates." + - bugfix: "Added antag-only warning to bee briefcase, to reduce chances of traitors killing themselves with it." From fd1fbd306d9ee944c6a263986d31234f19ece866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Wed, 22 Jun 2016 10:53:22 +0200 Subject: [PATCH 18/28] TAFFY WHY DID YOU LEAVE ME --- code/modules/food/recipes_candy.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food/recipes_candy.dm b/code/modules/food/recipes_candy.dm index 8067820786f..2ab54fc0e27 100644 --- a/code/modules/food/recipes_candy.dm +++ b/code/modules/food/recipes_candy.dm @@ -69,7 +69,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/candy/toffee /datum/recipe/candy/taffy - reagents = list("sugar" = 5, "water" = 5, "sodiumchloride" = 5) + reagents = list("salglu_solution" = 15) items = list() result = /obj/item/weapon/reagent_containers/food/snacks/candy/taffy @@ -532,4 +532,4 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/caramel, /obj/item/weapon/reagent_containers/food/snacks/candy/nougat, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat From 17ef81e8a5dcdf135507102f610e2d7a3c6b26bb Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 22 Jun 2016 10:18:44 -0400 Subject: [PATCH 19/28] Fixes Clumsy Gun Check --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f86bfff5abb..d684175a6a5 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -140,7 +140,7 @@ //Exclude lasertag guns from the CLUMSY check. if(clumsy_check) if(istype(user)) - if (user.disabilities & CLUMSY && prob(40)) + if((CLUMSY in user.mutations) && prob(40)) to_chat(user, "You shoot yourself in the foot with \the [src]!") var/shot_leg = pick("l_foot", "r_foot") process_fire(user, user, 0, params, zone_override = shot_leg) From dfd42333dd8fbd70fbe4620de47ce90c8482dd93 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 22 Jun 2016 10:44:32 -0400 Subject: [PATCH 20/28] Automatic changelog generation for PR #4753 --- html/changelogs/AutoChangeLog-pr-4753.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4753.yml diff --git a/html/changelogs/AutoChangeLog-pr-4753.yml b/html/changelogs/AutoChangeLog-pr-4753.yml new file mode 100644 index 00000000000..b9453c47df6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4753.yml @@ -0,0 +1,4 @@ +author: Fox McCloud +delete-after: True +changes: + - bugfix: "Fixes clumsy check on guns not working properly, resulting in people with glasses shooting themselves in the foot" From 8da432cccbaf26b69f1fe80422cb6b0603cd1872 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 22 Jun 2016 14:03:06 -0400 Subject: [PATCH 21/28] Automatic changelog generation for PR #4713 --- html/changelogs/AutoChangeLog-pr-4713.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4713.yml diff --git a/html/changelogs/AutoChangeLog-pr-4713.yml b/html/changelogs/AutoChangeLog-pr-4713.yml new file mode 100644 index 00000000000..707c156a1e2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4713.yml @@ -0,0 +1,4 @@ +author: DaveTheHeadcrab +delete-after: True +changes: + - rscadd: "Adds workboots to be worn by engineers." From 22a3bcf704974f64f437e2ba898d4a9a54710575 Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 22 Jun 2016 14:24:22 -0400 Subject: [PATCH 22/28] Emote Fixes and "Me" Tweak (#4749) - Tweaked "Me" verb to allow inclusion of the message when typing directly into chat box. - Fixed ghosts, with ghostsight on, seeing emotes twice when near the emoter. - Fixed *flip runtiming when used with no target and no grab. - Fixed scream not displaying any message. - Fixed double sanitizing in custom emotes. - Fixed several cases where user wasn't getting passed into proc calls. - Removed a couple unnecessary periods from dialogs. --- code/datums/Emote_system/emote.dm | 31 ++++++++++++++++-------------- code/datums/Emote_system/emotes.dm | 19 +++++++++++++++++- code/modules/mob/say.dm | 13 +++++++++++-- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm index 07089785740..4f130fbf330 100644 --- a/code/datums/Emote_system/emote.dm +++ b/code/datums/Emote_system/emote.dm @@ -281,7 +281,7 @@ VampyrBytes var/end = start + lentext(startText) + 1 message = copytext(message, 1, start) + copytext(message, end, lentext(message) + 1) - message = replaceMobWithYou(user, message) + message = replaceMobWithYou(user, message, user) return message @@ -298,21 +298,21 @@ VampyrBytes visualOrAudible = 1 log_emote("[user.name]/[user.key] : [message]") - sendToDead(message) + sendToDead(user, message) for(var/mob/M in getRecipients(getLoc(user, message), visualOrAudible)) var/msg = "" if(M==user) msg = createSelfMessage(user, params, message) if(msg) - outputMessage(M, msg) + outputMessage(M, msg, user) continue if(M.stat == UNCONSCIOUS || (M.sleeping && M.stat != DEAD)) if(!visualOrAudible == 2) continue msg = "... You can almost hear someone talking ..." - outputMessage(M, msg) + outputMessage(M, msg, user) continue if(M.sdisabilities & DEAF || M.ear_deaf) @@ -325,7 +325,7 @@ VampyrBytes if(!msg && visualOrAudible == 2) continue if(msg) - outputMessage(M, msg) + outputMessage(M, msg, user) continue if(M.sdisabilities & BLIND || M.blinded || M.paralysis || (M.see_invisible < user.invisibility && visualOrAudible == 2)) @@ -336,7 +336,7 @@ VampyrBytes if(!msg && visualOrAudible == 1) continue if(msg) - outputMessage(M, msg) + outputMessage(M, msg, user) continue if(M.see_invisible < user.invisibility && visualOrAudible == 1) @@ -406,12 +406,15 @@ VampyrBytes message = addExtras(message) return message -/datum/emote/proc/sendToDead(var/message = "") +/datum/emote/proc/sendToDead(var/mob/user, var/message = "", var/ghostEmote) for(var/mob/M in dead_mob_list) if(!M.client || istype(M, /mob/new_player)) continue //skip monkeys, leavers and new players - if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null))) - M.show_message(message) + if(M.stat == DEAD) + if(ghostEmote && ((M.client.prefs.toggles & CHAT_GHOSTSIGHT) || (M in viewers(user)))) + M.show_message(message) + else if((M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(user))) + M.show_message(message) /datum/emote/proc/playSound(var/mob/user, var/list/params) if(!sound) @@ -534,10 +537,10 @@ one is used in /datum/emote_handler/customEmote(). /datum/emote/custom/proc/getMessage(var/mob/user) // user.set_typing_indicator(1) // user.hud_typing = 1 - var/input = sanitize(copytext(input(user,"What do you want to emote?.", "Custom emote") as text|null,1,MAX_MESSAGE_LEN)) + var/input = copytext(input(user,"What do you want to emote?", "Custom emote") as text|null,1,MAX_MESSAGE_LEN) // user.hud_typing = 0 // user.set_typing_indicator(0) - input = strip_html_properly(input) + input = trim_strip_html_properly(input) return input /datum/emote/custom/available(var/mob/user) @@ -572,13 +575,13 @@ one is used in /datum/emote_handler/customEmote(). return "deadchat is globally muted" /datum/emote/custom/ghost/getMessage(var/mob/user) - var/input = sanitize(copytext(input(user,"What do you want to emote?.", "Custom emote") as text|null,1,MAX_MESSAGE_LEN)) - input = strip_html_properly(input) + var/input = copytext(input(user,"What do you want to emote?", "Custom emote") as text|null,1,MAX_MESSAGE_LEN) + input = trim_strip_html_properly(input) return input /datum/emote/custom/ghost/processMessage(var/mob/user, var/list/params, var/message = "") if(!message) return log_emote("Ghost/[user.key] : [message]") - sendToDead(message) + sendToDead(user, message, ghostEmote = 1) diff --git a/code/datums/Emote_system/emotes.dm b/code/datums/Emote_system/emotes.dm index a5383c30c23..fd17fcc3953 100644 --- a/code/datums/Emote_system/emotes.dm +++ b/code/datums/Emote_system/emotes.dm @@ -594,7 +594,7 @@ /datum/emote/flip/flipOver/doAction(var/mob/user, var/params, var/message) var/obj/item/weapon/grab/G = user.get_active_hand() - if(G == params["target"]) + if(istype(G) && (G.affecting == params["target"]) && !G.affecting.buckled) var/turf/oldloc = user.loc var/turf/newloc = G.affecting.loc if(isturf(oldloc) && isturf(newloc)) @@ -1150,12 +1150,29 @@ name = "scream" desc = "makes the mob scream" commands = list("scream", "screams") + text = "screams!" + selfText = "scream!" audible = 1 mimeText = "acts out a scream" muzzledNoise = "very loud" cooldown = 50 vol = 80 +/datum/emote/scream/createMessage(var/mob/user, var/list/params) + var/mob/living/carbon/human/H = user + + if(istype(H)) + return "\The [user] [H.species.scream_verb]!" + else + return ..() + +/datum/emote/scream/replaceMobWithYou(var/mob/M, var/message = "", var/mob/user) + var/mob/living/carbon/human/H = user + + if(istype(H) && (H.species.scream_verb != "screams")) + return message + return ..() + /datum/emote/scream/machine name = "machine scream" sound = 'sound/goonstation/voice/robot_scream.ogg' diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 70d1e72205a..493fade2ea1 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -28,12 +28,21 @@ usr.say(message) -/mob/verb/me_verb() +/mob/verb/me_verb(message as text) set name = "Me" set category = "Emotes" + set desc = "(action) Enter a custom emote." + + if(!message) + return + + message = trim_strip_html_properly(message) + + if(message == "") + return if(emoteHandler) - return emoteHandler.runEmote("me") + return emoteHandler.runEmote("me", message) /mob/proc/say_dead(var/message) From 63f731428a76af649834b2d3b33eda3e93a2c9df Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 23 Jun 2016 09:07:10 +1200 Subject: [PATCH 23/28] Actually fix the travis linux grep I don't know how I missed that there are two paths, but this brings the linux grep regex inline with the windows grep regex. Previous: #4575 --- dm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dm.sh b/dm.sh index d77cabc637a..9585e2f1ce3 100644 --- a/dm.sh +++ b/dm.sh @@ -70,7 +70,7 @@ then "$dm" $dmepath.mdme 2>&1 | tee result.log retval=$? - if ! grep '0 errors, 0 warnings' result.log + if ! grep '\- 0 errors, 0 warnings' result.log then retval=1 #hard fail, due to warnings or errors fi From 051daa2e25e2d262f8f5ce333b00d6b45dd21b2a Mon Sep 17 00:00:00 2001 From: TheDZD Date: Wed, 22 Jun 2016 17:50:18 -0400 Subject: [PATCH 24/28] Fixes staff of nothing runtimes and some pathing (#4758) --- code/modules/projectiles/guns/magic/staff.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 85b483b8363..9ef7de7f369 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -1,21 +1,22 @@ -obj/item/weapon/gun/magic/staff/ +/obj/item/weapon/gun/magic/staff slot_flags = SLOT_BACK + ammo_type = /obj/item/ammo_casing/magic -obj/item/weapon/gun/magic/staff/change +/obj/item/weapon/gun/magic/staff/change name = "staff of change" desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" ammo_type = /obj/item/ammo_casing/magic/change icon_state = "staffofchange" item_state = "staffofchange" -obj/item/weapon/gun/magic/staff/animate +/obj/item/weapon/gun/magic/staff/animate name = "staff of animation" desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines." ammo_type = /obj/item/ammo_casing/magic/animate icon_state = "staffofanimation" item_state = "staffofanimation" -obj/item/weapon/gun/magic/staff/healing +/obj/item/weapon/gun/magic/staff/healing name = "staff of healing" desc = "An artefact that spits bolts of restoring magic which can remove ailments of all kinds and even raise the dead." ammo_type = /obj/item/ammo_casing/magic/heal @@ -25,7 +26,7 @@ obj/item/weapon/gun/magic/staff/healing /obj/item/weapon/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves return -obj/item/weapon/gun/magic/staff/chaos +/obj/item/weapon/gun/magic/staff/chaos name = "staff of chaos" desc = "An artefact that spits bolts of chaotic magic that can potentially do anything." ammo_type = /obj/item/ammo_casing/magic/chaos @@ -35,7 +36,7 @@ obj/item/weapon/gun/magic/staff/chaos recharge_rate = 2 no_den_usage = 1 -obj/item/weapon/gun/magic/staff/door +/obj/item/weapon/gun/magic/staff/door name = "staff of door creation" desc = "An artefact that spits bolts of transformative magic that can create doors in walls." ammo_type = /obj/item/ammo_casing/magic/door @@ -55,7 +56,7 @@ obj/item/weapon/gun/magic/staff/door max_charges = 4 recharge_rate = 8 -obj/item/weapon/gun/magic/staff/focus +/obj/item/weapon/gun/magic/staff/focus name = "mental focus" desc = "An artefact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out." icon = 'icons/obj/wizard.dmi' From 0b25a0ed020ecd3d80d505030eb82d50b62bcfc8 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 23 Jun 2016 04:20:02 -0400 Subject: [PATCH 25/28] Fixes snpc PDA bug, heavily reduces rate that snpc chef does their thing (#4742) --- .../mob/living/carbon/human/interactive/functions.dm | 8 +++++++- .../mob/living/carbon/human/interactive/interactive.dm | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index b0806e66241..c1b22e721f2 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -433,7 +433,7 @@ return 1 /mob/living/carbon/human/interactive/proc/souschef(obj) - if(shouldModulePass() || enforceHome() || prob(SNPC_FUZZY_CHANCE_LOW)) + if(shouldModulePass() || enforceHome() || prob(SNPC_FUZZY_CHANCE_HIGH) || prob(SNPC_FUZZY_CHANCE_HIGH)) return if(doing & SNPC_SPECIAL) @@ -776,6 +776,12 @@ else return "[word]ed" +/mob/living/carbon/human/interactive/proc/ing_verb(word) + if(copytext(word, length(word)) == "e") + return "[copytext(word, 1, length(word))]ing" + else + return "[word]ing" + /mob/living/carbon/human/interactive/proc/paperwork_sentence() var/verbs_use = pick_list(speak_file, "verbs_use") var/verbs_touch = pick_list(speak_file, "verbs_touch") diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm index 14402788451..9e4b77f055f 100644 --- a/code/modules/mob/living/carbon/human/interactive/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm @@ -258,12 +258,15 @@ RPID.access = myjob.get_access() equip_to_slot_or_del(MYID, slot_wear_id) - MYPDA = new(src) + if(wear_pda) + MYPDA = wear_pda + else + MYPDA = new(src) + equip_to_slot_or_del(MYPDA, slot_wear_pda) MYPDA.owner = real_name MYPDA.ownjob = alt_title MYPDA.ownrank = job MYPDA.name = "PDA-[real_name] ([alt_title])" - equip_to_slot_or_del(MYPDA, slot_belt) zone_sel.selecting = "chest" //arms if(prob((SNPC_FUZZY_CHANCE_LOW+SNPC_FUZZY_CHANCE_HIGH)/4)) @@ -836,7 +839,7 @@ return 0 if(myPath.len <= 0) - myPath = get_path_to(src, get_turf(target), /turf/proc/Distance, SNPC_MAX_RANGE_FIND + 1, 250,1, id=Path_ID) + myPath = get_path_to(src, get_turf(target), /turf/proc/Distance, SNPC_MAX_RANGE_FIND + 1, 250,1, id=Path_ID, simulated_only = 0) if(myPath) if(myPath.len > 0) From b8c1418b5785389d81d927c54edcc4ed3b22d42a Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 23 Jun 2016 04:20:26 -0400 Subject: [PATCH 26/28] Adds simple obj to load in templates (#4740) Also template loader bugfix --- code/datums/helper_datums/map_template.dm | 8 ++--- code/modules/awaymissions/map_rng.dm | 38 +++++++++++++++++++++++ paradise.dme | 1 + 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 code/modules/awaymissions/map_rng.dm diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 22419fa6edb..d6291124867 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -61,7 +61,7 @@ /proc/preloadTemplates(path = "_maps/map_files/templates/") //see master controller setup - var/list/filelist = flist(path) - for(var/map in filelist) - var/datum/map_template/T = new(path = "[path][map]", rename = "[map]") - map_templates[T.name] = T \ No newline at end of file + for(var/map in flist(path)) + if(cmptext(copytext(map, length(map) - 3), ".dmm")) + var/datum/map_template/T = new(path = "[path][map]", rename = "[map]") + map_templates[T.name] = T \ No newline at end of file diff --git a/code/modules/awaymissions/map_rng.dm b/code/modules/awaymissions/map_rng.dm new file mode 100644 index 00000000000..469dffaca54 --- /dev/null +++ b/code/modules/awaymissions/map_rng.dm @@ -0,0 +1,38 @@ +/obj/effect/landmark/map_loader + name = "map loader" + icon = 'icons/mob/screen_gen.dmi' + icon_state = "x2" + invisibility = 101 + anchored = 1 + density = 0 + opacity = 0 + var/template_name = null + var/datum/map_template/template = null + var/centered = 1 + +/obj/effect/landmark/map_loader/New(loc, tname) + ..() + if(tname) + template_name = tname + if(template_name) + template = map_templates[template_name] + if(template) + load(template) + +/obj/effect/landmark/map_loader/proc/load(datum/map_template/t) + spawn(1) + if(!t) + return + t.load(get_turf(src), centered = centered) + t.loaded++ + qdel(src) + +/obj/effect/landmark/map_loader/random + var/template_list = "" + +/obj/effect/landmark/map_loader/random/New() + ..() + if(template_list) + template_name = safepick(splittext(template_list, ";")) + template = map_templates[template_name] + load(template) \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index f8083c5d9eb..d67a359cfc7 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1093,6 +1093,7 @@ #include "code\modules\awaymissions\exile.dm" #include "code\modules\awaymissions\gateway.dm" #include "code\modules\awaymissions\loot.dm" +#include "code\modules\awaymissions\map_rng.dm" #include "code\modules\awaymissions\pamphlet.dm" #include "code\modules\awaymissions\trigger.dm" #include "code\modules\awaymissions\zlevel.dm" From 732c3b4ae5fa94de9a3cd900fed520a73d1273d2 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Thu, 23 Jun 2016 13:56:15 -0700 Subject: [PATCH 27/28] Goonchat (#4744) * bicon regex run * Remove all \black * Goonchat from /vg/ / Goon Whoo! Special thanks to @Tastyfish for the macro2html thing so all of our horrible color macros keep working and don't fail horribly <3 * Fixes and changes n stuff - Made ping sane again (the fuck PJ) - Updated chat CSS - Fixed like one problem with a color macro * whoops * Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk) * Strip problematic tags from tcomm scripts -