diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index b0a2e6fa50e..47e2cdc4c8e 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -529,9 +529,26 @@ var/list/datum/dna/hivemind_bank = list() if(src && src.mind && src.mind.changeling) src.mind.changeling.mimicing = "" - ////////// - //STINGS// //They get a pretty header because there's just so fucking many of them ;_; - ////////// + +/mob/living/carbon/proc/changeling_arm_blade() + set category = "Changeling" + set name = "Arm Blade (20)" + + var/datum/changeling/changeling = changeling_power(20) + if(!changeling) + return + + drop_item(get_active_hand()) + + put_in_hands(new /obj/item/weapon/melee/arm_blade(src)) + changeling.geneticdamage += 4 + + changeling.chem_charges -= 20 + + +////////// +//STINGS// //They get a pretty header because there's just so fucking many of them ;_; +////////// /mob/living/carbon/proc/set_sting(A, icon, dna=null) //setting the sting and ui icon for it src << "We prepare our sting, use alt+click on target to sting them." @@ -680,4 +697,4 @@ var/list/datum/dna/hivemind_bank = list() T.reagents.add_reagent("ice", 30) feedback_add_details("changeling_powers","CS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 68450590a44..6c23082de16 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -161,6 +161,13 @@ var/list/powerinstances allowduringlesserform = 1 verbpath = /mob/living/carbon/proc/changeling_mute_sting +/datum/power/changeling/arm_blade + name = "Arm Blade" + desc = "We reform one of our arms into a deadly blade." + helptext = "Cannot be used while in lesser form." + genomecost = 1 + allowduringlesserform = 0 + verbpath = /mob/living/carbon/proc/changeling_arm_blade // Modularchangling, totally stolen from the new player panel. YAYY /datum/changeling/proc/EvolutionMenu()//The new one diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c1f750e0aa6..34b1e9d1ef8 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -310,7 +310,8 @@ playsound(src.loc, "sparks", 50, 1) table_destroy(1, user) - user.drop_item(src) + if(!(((I.flags & ABSTRACT)))) //WE NEED MORE PAREMS + user.drop_item(src) /obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user as mob) diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 9b6c2ec08fe..fee06bfd232 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index cb8ebcaedb3..3525101789d 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 09ceeed47d5..dddee09de9d 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/tgstation.dme b/tgstation.dme index c63cafdcabc..fc0310a2608 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -244,6 +244,7 @@ #include "code\game\gamemodes\blob\blobs\resource.dm" #include "code\game\gamemodes\blob\blobs\shield.dm" #include "code\game\gamemodes\changeling\changeling.dm" +#include "code\game\gamemodes\changeling\changeling_mutations.dm" #include "code\game\gamemodes\changeling\changeling_powers.dm" #include "code\game\gamemodes\changeling\modularchangling.dm" #include "code\game\gamemodes\changeling\traitor_chan.dm"