cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors signallers, assemblies, electropacks (#18689)

Browse Source 
* Refactors signalers, assemblies, electropacks

* Update code/game/objects/items/devices/radio/electropack.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
AffectedArc07
2022-08-15 16:36:34 +01:00
committed by GitHub
parent 98a143afb6
commit aba452f785
27 changed files with 413 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+3 -3
View File
@@ -181,9 +181,9 @@
/obj/structure/closet/secure_closet/animal/populate_contents()
new /obj/item/assembly/signaler(src)
new /obj/item/radio/electropack(src)
new /obj/item/radio/electropack(src)
new /obj/item/radio/electropack(src)
new /obj/item/electropack(src)
new /obj/item/electropack(src)
new /obj/item/electropack(src)
/obj/structure/closet/secure_closet/chemical
code/game/objects/structures/crates_lockers/crates.dm
+3 -3
View File
@@ -40,7 +40,7 @@
return FALSE
break
if(rigged && locate(/obj/item/radio/electropack) in src)
if(rigged && locate(/obj/item/electropack) in src)
if(isliving(usr))
var/mob/living/L = usr
if(L.electrocute_act(17, src))
@@ -105,7 +105,7 @@
else
to_chat(user, "<span class='warning'>You need atleast 15 wires to rig [src]!</span>")
return TRUE
if(istype(W, /obj/item/radio/electropack))
if(istype(W, /obj/item/electropack))
if(rigged)
if(!user.drop_item())
to_chat(user, "<span class='warning'>[W] seems to be stuck to your hand!</span>")
@@ -140,7 +140,7 @@
update_icon()
return
else
if(rigged && locate(/obj/item/radio/electropack) in src)
if(rigged && locate(/obj/item/electropack) in src)
if(isliving(user))
var/mob/living/L = user
if(L.electrocute_act(17, src))
code/game/objects/structures/electricchair.dm
+3 -3
View File
@@ -18,9 +18,9 @@
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
var/obj/item/electropack/part2 = new(part)
part2.integrated_signaler.frequency = 1445
part2.integrated_signaler.code = 6
part2.master = part
part.part1 = part1
part.part2 = part2