From fefa8e37c58e2185bf159d2bb185aa6e7d8e868d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Dec 2016 05:50:52 -0600 Subject: [PATCH 1/4] table SLAM --- code/game/objects/structures/tables_racks.dm | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c16605b126..f3478a54c2 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -302,6 +302,26 @@ for(var/obj/item/weapon/shard/S in debris) S.color = NARSIE_WINDOW_COLOUR +/obj/structure/table/glass/attack_hand(mob/living/carbon/human/M, mob/living/user) + var/mob/living/carbon/human/H = M + if (ishuman(M) && (M.a_intent == "harm")) +// if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.specflags)) + //if (istype(H.w_uniform, /obj/item/clothing/under/misc/lawyer)) + src.visible_message("[H] slams their palms against [src]!") + visible_message("[src] breaks!") + playsound(src.loc, "shatter", 50, 1) + new frame(src.loc) + new /obj/item/weapon/shard(src.loc) + qdel(src) + H << "[src] cuts into your hand!" + var/organ = (H.hand ? "l_" : "r_") + "arm" + var/obj/item/bodypart/affecting = H.get_bodypart(organ) + if(affecting && affecting.take_damage(force / 2)) + H.update_damage_overlays(0) + else if(ismonkey(user)) + M << "[src] cuts into your hand!" + M.adjustBruteLoss(force / 2) + /* * Wooden tables */ @@ -333,6 +353,17 @@ /obj/structure/table/wood/poker/narsie_act() new /obj/structure/table/wood(src.loc) +/obj/structure/table/attack_hand(mob/living/carbon/human/M, mob/living/user) + if (ishuman(M) && (M.a_intent == "harm")) + var/mob/living/carbon/human/H = M + //if (istype(H.w_uniform, /obj/item/clothing/under/misc/lawyer)) + src.visible_message("[H] slams their palms against [src]!") + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 50, 1) + //for (var/mob/M in AIviewers(usr, null)) + // if (M.client) + // shake_camera(M, 4, 1, 0.5) + return + /* * Reinforced tables */ From d27ec3b4fefc16c1b3daee4511d07cbcce54dc1e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Dec 2016 22:15:53 -0600 Subject: [PATCH 2/4] cloning fix. --- code/game/machinery/cloning.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 63104023bb..94223d8580 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -186,13 +186,13 @@ H.adjustBrainLoss(CLONE_INITIAL_DAMAGE) H.Paralyse(4) - if(H.client.prefs) +/* if(H.client.prefs) H.vore_organs = H.client.prefs.belly_prefs.Copy() for(var/I in H.vore_organs) var/datum/belly/B = H.vore_organs[I] B.owner = H B.internal_contents = list() - B.digest_mode = DM_HOLD + B.digest_mode = DM_HOLD*/ // H.flavor_text = R.flavor.Copy() From 63876abd5af6afb86274e54c3e2b76ca4f9c264f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Dec 2016 22:17:09 -0600 Subject: [PATCH 3/4] changelog --- html/changelogs/Jay-PR-3.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 html/changelogs/Jay-PR-3.yml diff --git a/html/changelogs/Jay-PR-3.yml b/html/changelogs/Jay-PR-3.yml new file mode 100644 index 0000000000..7b0fbd1a2c --- /dev/null +++ b/html/changelogs/Jay-PR-3.yml @@ -0,0 +1,35 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: "Jay" + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix "Cloning shold properly work. (Cloning as the species you're supposed to be.)" From a5bd794151844637065862cd870e8b293ed6e535 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Dec 2016 22:55:50 -0600 Subject: [PATCH 4/4] disabled table slamming for now --- code/game/objects/structures/tables_racks.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index f3478a54c2..4c4c2afef9 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -302,6 +302,7 @@ for(var/obj/item/weapon/shard/S in debris) S.color = NARSIE_WINDOW_COLOUR +/* /obj/structure/table/glass/attack_hand(mob/living/carbon/human/M, mob/living/user) var/mob/living/carbon/human/H = M if (ishuman(M) && (M.a_intent == "harm")) @@ -320,7 +321,7 @@ H.update_damage_overlays(0) else if(ismonkey(user)) M << "[src] cuts into your hand!" - M.adjustBruteLoss(force / 2) + M.adjustBruteLoss(force / 2) */ /* * Wooden tables @@ -353,6 +354,7 @@ /obj/structure/table/wood/poker/narsie_act() new /obj/structure/table/wood(src.loc) +/* /obj/structure/table/attack_hand(mob/living/carbon/human/M, mob/living/user) if (ishuman(M) && (M.a_intent == "harm")) var/mob/living/carbon/human/H = M @@ -361,7 +363,7 @@ playsound(src.loc, 'sound/effects/meteorimpact.ogg', 50, 1) //for (var/mob/M in AIviewers(usr, null)) // if (M.client) - // shake_camera(M, 4, 1, 0.5) + // shake_camera(M, 4, 1, 0.5)*/ return /*