Skip to content

Commit 8b9e3a2

Browse files
wykthor-btrackerKwask
authored andcommitted
code cleaning, adding teleporter console (#735)
1 parent ace8b6a commit 8b9e3a2

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

code/game/machinery/teleporter.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@
327327
component_parts += new /obj/item/weapon/stock_parts/manipulator
328328
component_parts += new /obj/item/weapon/stock_parts/scanning_module
329329
component_parts += new /obj/item/weapon/stock_parts/scanning_module
330+
RefreshParts()
330331
overlays.Cut()
331332
overlays += image('icons/obj/stationobjs.dmi', icon_state = "controller-wires")
332333

code/modules/research/designs.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ datum/design/circuit/teleconsole
167167
name = "teleporter control console"
168168
id = "teleconsole"
169169
req_tech = list("programming" = 3, "bluespace" = 2)
170+
build_path = /obj/item/weapon/circuitboard/teleporter
170171

171172
datum/design/circuit/emp_data
172173
name = "employment records console"

code/modules/research/destructive_analyzer.dm

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,21 @@ Note: Must be placed within 3 tiles of the R&D Console
4444
if (shocked)
4545
shock(user,50)
4646
if (istype(O, /obj/item/weapon/screwdriver))
47-
if (!opened)
48-
opened = 1
47+
if (!panel_open)
48+
panel_open = 1// This is for the default proc
4949
if(linked_console)
5050
linked_console.linked_destroy = null
5151
linked_console = null
5252
icon_state = "d_analyzer_t"
5353
user << "You open the maintenance hatch of [src]."
5454
else
55-
opened = 0
55+
panel_open = 0
5656
icon_state = "d_analyzer"
5757
user << "You close the maintenance hatch of [src]."
5858
return
5959
if (opened)
6060
if(istype(O, /obj/item/weapon/crowbar))
61-
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
62-
var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
63-
M.state = 2
64-
M.icon_state = "box_1"
65-
for(var/obj/I in component_parts)
66-
I.loc = src.loc
67-
qdel(src)
61+
default_deconstruction_crowbar(O)
6862
return 1
6963
else
7064
user << "<span class='alert'>You can't load the [src.name] while it's opened.</span>"

0 commit comments

Comments
 (0)