mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-20 18:47:20 +01:00
Vi3triceandGitHub
f4b37b4177
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b.
* Icon conflict
* Fix organ damage
* Don't ask how. Why. It's like that on prod too.
* Cutting down on things and updating from TG.
* More flexible. Just in case the thing you stuck it on didn't destroy.
* Hydro was one the things I touched earlier on, better rework it
* Reviews
* Cleaning up further, also bri'ish
* Undo a change I did, and switch over to a more recent implementation
* Update biogenerator.dm
* Rolling back to old airlocks, but with new duct taped note
* Functionally the same. I'd just rather not have the smoothing happen there
* Went over APCs again
* Fix welding helmet names in species files
* Update airlock.dm
* Update persistent_overlay.dm
* Oh, topic
96 lines
2.6 KiB
Plaintext
96 lines
2.6 KiB
Plaintext
/obj/structure/chair/e_chair
|
|
name = "electric chair"
|
|
desc = "Looks absolutely SHOCKING!"
|
|
icon_state = "echair0"
|
|
item_chair = null
|
|
var/obj/item/assembly/shock_kit/part = null
|
|
var/last_time = 1.0
|
|
var/delay_time = 50
|
|
var/shocking = FALSE
|
|
|
|
/obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk)
|
|
. = ..()
|
|
update_icon(UPDATE_OVERLAYS)
|
|
|
|
if(sk)
|
|
part = sk
|
|
|
|
if(isnull(part)) //This e-chair was not custom built
|
|
part = new(src)
|
|
var/obj/item/clothing/head/helmet/part1 = new(part)
|
|
var/obj/item/radio/electropack/part2 = new(part)
|
|
part2.set_frequency(1445)
|
|
part2.code = 6
|
|
part2.master = part
|
|
part.part1 = part1
|
|
part.part2 = part2
|
|
|
|
/obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params)
|
|
if(istype(W, /obj/item/wrench))
|
|
var/obj/structure/chair/C = new /obj/structure/chair(loc)
|
|
playsound(loc, W.usesound, 50, 1)
|
|
C.dir = dir
|
|
part.loc = loc
|
|
part.master = null
|
|
part = null
|
|
qdel(src)
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/chair/e_chair/verb/activate_e_chair()
|
|
set name = "Activate Electric Chair"
|
|
set category = "Object"
|
|
set src in oview(1)
|
|
if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
|
|
return
|
|
if(last_time + delay_time > world.time)
|
|
to_chat(usr, "<span class='warning'>\The [src] is not ready yet!</span>")
|
|
return
|
|
to_chat(usr, "<span class='notice'>You activate \the [src].</span>")
|
|
shock()
|
|
|
|
/obj/structure/chair/e_chair/rotate()
|
|
..()
|
|
update_icon(UPDATE_OVERLAYS)
|
|
|
|
/obj/structure/chair/e_chair/update_icon_state()
|
|
icon_state = "echair[shocking]"
|
|
|
|
/obj/structure/chair/e_chair/update_overlays()
|
|
. = ..()
|
|
. += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir)
|
|
|
|
/obj/structure/chair/e_chair/proc/shock()
|
|
if(last_time + delay_time > world.time)
|
|
return
|
|
last_time = world.time
|
|
|
|
shocking = TRUE
|
|
update_icon(UPDATE_ICON_STATE)
|
|
spawn(delay_time)
|
|
shocking = FALSE
|
|
update_icon(UPDATE_ICON_STATE)
|
|
|
|
// special power handling
|
|
var/area/A = get_area(src)
|
|
if(!isarea(A))
|
|
return
|
|
if(!A.powered(EQUIP))
|
|
return
|
|
A.use_power(5000, EQUIP)
|
|
var/light = A.power_light
|
|
A.update_icon(UPDATE_ICON_STATE)
|
|
|
|
flick("echair_shock", src)
|
|
do_sparks(12, 1, src)
|
|
visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
|
|
if(has_buckled_mobs())
|
|
for(var/m in buckled_mobs)
|
|
var/mob/living/buckled_mob = m
|
|
buckled_mob.electrocute_act(110, src, 1)
|
|
to_chat(buckled_mob, "<span class='danger'>You feel a deep shock course through your body!</span>")
|
|
spawn(1)
|
|
buckled_mob.electrocute_act(110, src, 1)
|
|
A.power_light = light
|
|
A.update_icon(UPDATE_ICON_STATE)
|