From 7524bca98680a81279f098d87100226a4bbb5eca Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Sat, 29 Oct 2011 02:15:50 +0000 Subject: [PATCH] Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2439 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/gloves.dm | 10 +++- code/game/objects/items/weapons/stungloves.dm | 47 ++++++++++++++++++ .../living/carbon/alien/humanoid/humanoid.dm | 30 ++++++----- .../mob/living/carbon/alien/larva/larva.dm | 30 ++++++----- .../living/carbon/human/human_attackhand.dm | 29 +++++------ .../mob/living/carbon/metroid/metroid.dm | 18 ++++--- .../mob/living/carbon/monkey/monkey.dm | 34 +++++++------ code/modules/power/cable.dm | 19 ------- code/modules/power/cell.dm | 5 +- html/changelog.html | 12 ++++- icons/obj/clothing/gloves.dmi | Bin 6995 -> 3616 bytes tgstation.dme | 1 + 12 files changed, 152 insertions(+), 83 deletions(-) create mode 100644 code/game/objects/items/weapons/stungloves.dm diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 37b17a219bc..29f8957f200 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -7,11 +7,14 @@ protective_temperature = 400 heat_transfer_coefficient = 0.25 siemens_coefficient = 0.50 - var/elecgen = 0 - var/uses = 0 +// var/elecgen = 0 //WHAT THE FUCK IS THIS SHIT OH GOD WHY ;-; +// var/uses = 0 //NOPE NOPE NOPE NOPE var/wired = 0 + var/obj/item/weapon/cell/cell = 0 body_parts_covered = HANDS +//(CAPS IS CRUISE CONTROL FOR COOL AS WE ALL KNOW) + /obj/item/clothing/gloves/white name = "White Gloves" desc = "These look pretty fancy." @@ -92,6 +95,8 @@ var/mindrain = 200 var/maxdrain = 400 +//BEEP BEEP IT'S THE COMMENT BRIGADE -Pete +/* /obj/item/clothing/gloves/stungloves/ name = "Stungloves" desc = "These gloves are electrically charged." @@ -100,6 +105,7 @@ siemens_coefficient = 0.30 elecgen = 1 uses = 10 +*/ /obj/item/clothing/gloves/yellow desc = "These gloves are electrically insulated." diff --git a/code/game/objects/items/weapons/stungloves.dm b/code/game/objects/items/weapons/stungloves.dm new file mode 100644 index 00000000000..5af387774a7 --- /dev/null +++ b/code/game/objects/items/weapons/stungloves.dm @@ -0,0 +1,47 @@ +/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) + if(istype(W, /obj/item/weapon/cable_coil)) + var/obj/item/weapon/cable_coil/C = W + if(!wired) + if(C.amount >= 2) + C.amount -= 2 + wired = 1 + user << "You wrap some wires around [src]." + update_icon() + else + user << "There is not enough wire to cover [src]." + else + user << "[src] are already wired." + + else if(istype(W, /obj/item/weapon/cell)) + if(!wired) + user << "[src] need to be wired first." + else if(!cell) + user.drop_item() + W.loc = src + cell = W + user << "You attach a cell to [src]." + update_icon() + else + user << "[src] already have a cell." + + else if(istype(W, /obj/item/weapon/wirecutters)) + if(cell) + user << "You cut the cell away from [src]." + cell.loc = get_turf(src.loc) + cell = 0 + update_icon() + return + if(wired) //wires disappear into the void because fuck that shit + user << "You cut the wires away from [src]." + wired = 0 + update_icon() + ..() + return + +/obj/item/clothing/gloves/update_icon() //beep beep this'll probably break everything + ..() + overlays = null + if(wired) + overlays += "gloves_wire" + if(cell) + overlays += "gloves_cell" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 82c89cca204..c66230cf81e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -571,18 +571,24 @@ ..() - if(M.gloves && M.gloves.elecgen == 1)//Stungloves. Any contact will stun the alien. - if(M.gloves.uses > 0) - M.gloves.uses-- - if (weakened < 5) - weakened = 5 - if (stuttering < 5) - stuttering = 5 - if (stunned < 5) - stunned = 5 - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + if(M.gloves) + if(M.gloves.cell) + if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien. + if(M.gloves.cell.charge >= 2500) + M.gloves.cell.charge -= 2500 + if (weakened < 5) + weakened = 5 + if (stuttering < 5) + stuttering = 5 + if (stunned < 5) + stunned = 5 + for(var/mob/O in viewers(src, null)) + if ((O.client && !( O.blinded ))) + O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + return + else + M << "\red Not enough charge! " + return switch(M.a_intent) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 9a8797e9ca1..8a76b1f3caf 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -351,18 +351,24 @@ ..() - if(M.gloves && M.gloves.elecgen == 1)//Stungloves. Any contact will stun the alien. - if(M.gloves.uses > 0) - M.gloves.uses-- - if (weakened < 5) - weakened = 5 - if (stuttering < 5) - stuttering = 5 - if (stunned < 5) - stunned = 5 - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + if(M.gloves) + if(M.gloves.cell) + if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien. + if(M.gloves.cell.charge >= 2500) + M.gloves.cell.charge -= 2500 + if (weakened < 5) + weakened = 5 + if (stuttering < 5) + stuttering = 5 + if (stunned < 5) + stunned = 5 + for(var/mob/O in viewers(src, null)) + if ((O.client && !( O.blinded ))) + O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + return + else + M << "\red Not enough charge! " + return switch(M.a_intent) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index db1325159c2..4ed7847acb1 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -9,20 +9,21 @@ visible_message("\red [M] attempted to touch [src]!") return 0 - if((M.gloves && M.gloves.elecgen == 1)) - M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") - src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") - - if(M.gloves.uses <= 0) - M.gloves.elecgen = 0 - visible_message("\red [src] has been touched with the stun gloves by [M]!") - M << "\red Not enough charge! " - return - M.gloves.uses-- - var/armorblock = run_armor_check(M.zone_sel.selecting, "energy") - apply_effects(5,5,0,0,5,0,0,armorblock) - visible_message("\red [src] has been touched with the stun gloves by [M]!") - return 1 + if(M.gloves) + if(M.gloves.cell) + if(M.a_intent == "hurt") + if(M.gloves.cell.charge >= 2500) + M.gloves.cell.charge -= 2500 + visible_message("\red [src] has been touched with the stun gloves by [M]!") + M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") + src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") + var/armorblock = run_armor_check(M.zone_sel.selecting, "energy") + apply_effects(5,5,0,0,5,0,0,armorblock) + return 1 + else + M << "\red Not enough charge! " + visible_message("\red [src] has been touched with the stun gloves by [M]!") + return switch(M.a_intent) if("help") diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index cc6462af4dc..52c73ce0f24 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -452,12 +452,18 @@ - if(M.gloves && M.gloves.elecgen == 1)//Stungloves. Any contact will stun the alien. - if(M.gloves.uses > 0) - M.gloves.uses-- - for(var/mob/O in viewers(src, null)) - if ((O.client && !( O.blinded ))) - O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + if(M.gloves) + if(M.gloves.cell) + if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien. + if(M.gloves.cell.charge >= 2500) + M.gloves.cell.charge -= 2500 + for(var/mob/O in viewers(src, null)) + if ((O.client && !( O.blinded ))) + O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall.", 2) + return + else + M << "\red Not enough charge! " + return switch(M.a_intent) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 960e9f91045..8df097ebc90 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -156,22 +156,24 @@ if (istype(loc, /turf) && istype(loc.loc, /area/start)) M << "No attacking people at spawn, you jackass." return - if ((M:gloves && M:gloves.elecgen == 1 && M.a_intent == "hurt") /*&& (!istype(src:wear_suit, /obj/item/clothing/suit/judgerobe))*/) - if(M:gloves.uses > 0) - M:gloves.uses-- - if (weakened < 5) - weakened = 5 - if (stuttering < 5) - stuttering = 5 - if (stunned < 5) - stunned = 5 - for(var/mob/O in viewers(src, null)) - if (O.client) - O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall", 2) - else - M:gloves.elecgen = 0 - M << "\red Not enough charge! " - return + if(M.gloves) + if(M.gloves.cell) + if(M.a_intent == "hurt") + if(M.gloves.cell.charge >= 2500) + M.gloves.cell.charge -= 2500 + if (weakened < 5) + weakened = 5 + if (stuttering < 5) + stuttering = 5 + if (stunned < 5) + stunned = 5 + for(var/mob/O in viewers(src, null)) + if (O.client) + O.show_message("\red [src] has been touched with the stun gloves by [M]!", 1, "\red You hear someone fall", 2) + return + else + M << "\red Not enough charge! " + return if (M.a_intent == "help") help_shake_act(M) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index db06a85fbec..e0f5acf4710 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -62,25 +62,6 @@ ..() return - -/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = W - if(!istype(src, /obj/item/clothing/gloves/yellow)) - if(!wired) - if(C.amount >= 2) - C.amount -= 2 - wired = 1 - user << "You wrap some wires around [src]." - else - user << "There is not enough wire to cover [src]." - else - user << "[src] is already wired." - - else - ..() - return - // the power cable object /obj/structure/cable/New() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 1527fc4e053..8ef892942c7 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -77,6 +77,8 @@ //Just because someone gets you occasionally with stun gloves doesn't mean you can put in code to kill everyone who tries to make some. /obj/item/weapon/cell/attackby(obj/item/W, mob/user) ..() +//HONK HONK GLOVES NERF -Pete +/* var/obj/item/clothing/gloves/G = W if(istype(G)) // var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -98,8 +100,9 @@ use(G.uses*1000) updateicon() user << "\red These gloves are now electrically charged!" +*/ - else if(istype(W, /obj/item/weapon/reagent_containers/syringe)) + if(istype(W, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = W user << "You inject the solution into the power cell." diff --git a/html/changelog.html b/html/changelog.html index 712855e1ea4..a8ed9d445a6 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -39,7 +39,7 @@ Credits:
- Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA
 + Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat
 Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat
 Sounds: Skie, Lasty
 Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Erikat for the title image @@ -54,6 +54,16 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> +29 October 2011 +
    +
  • Petethegoat updated: +
      +
    • Stunglove overhaul: part one. Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character. Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves. To get your old inconspicous gloves back, simply cut away the wire and battery. Yet to come: insulated gloves losing their insulative properties when wired, and stungloves taking extra damage from shocked doors.
      • +
    +
    • +
+ + 27 October 2011
  • Mport updated: diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 01e57efc3a415c6ac1da7f48565a576d83b4918d..abead579d61741037b4daf81900adb618717463f 100644 GIT binary patch literal 3616 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 JDU~++@E;C&ZRY?0 diff --git a/tgstation.dme b/tgstation.dme index abc0e20a338..3f1bd0001e9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -627,6 +627,7 @@ #include "code\game\objects\items\weapons\plant_bag.dm" #include "code\game\objects\items\weapons\RCD.dm" #include "code\game\objects\items\weapons\RSF.dm" +#include "code\game\objects\items\weapons\stungloves.dm" #include "code\game\objects\items\weapons\surgery_tools.dm" #include "code\game\objects\items\weapons\swords_axes_etc.dm" #include "code\game\objects\items\weapons\table_rack_parts.dm"