cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 14:15:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Console Screens (#12512)

Browse Source
This commit is contained in:
Fox McCloud
2019-10-08 21:07:50 -04:00
committed by variableundefined
parent 9428f6a87f
commit affa319fab
35 changed files with 116 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
+15 -15
View File
@@ -9606,11 +9606,11 @@
pixel_y = 0
},
/obj/item/circuitboard/microwave,
/obj/item/stock_parts/console_screen{
/obj/item/stack/sheet/glass{
pixel_x = 5;
pixel_y = 5
},
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/cable_coil/random{
pixel_x = 5;
pixel_y = 5
@@ -47974,9 +47974,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 8
@@ -69096,7 +69096,7 @@
/obj/item/clipboard,
/obj/item/folder/blue,
/obj/item/firelock_electronics,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/engine/engine_smes)
@@ -83142,7 +83142,7 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/airlock_electronics,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/assembly/signaler,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -87129,9 +87129,9 @@
},
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/toxins/lab)
@@ -92347,9 +92347,9 @@
/obj/structure/table/reinforced,
/obj/item/folder/white,
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/turf/simulated/floor/plating,
/area/medical/research)
"djc" = (
@@ -95268,7 +95268,7 @@
/area/maintenance/gambling_den)
"dox" = (
/obj/structure/table/reinforced,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/micro_laser,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -96090,7 +96090,7 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/firealarm_electronics,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/machinery/light/small{
dir = 4
},
_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+4 -4
View File
@@ -64529,7 +64529,7 @@
})
"cgG" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/airlock_electronics,
/obj/item/assembly/timer{
pixel_x = -4;
@@ -73591,9 +73591,9 @@
/area/medical/medbay3)
"cvl" = (
/obj/structure/table,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
_maps/map_files/RandomZLevels/stationCollision.dmm
+1 -1
View File
@@ -2077,7 +2077,7 @@
/obj/item/storage/toolbox/mechanical{
pixel_y = 5
},
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
_maps/map_files/RandomZLevels/terrorspiders.dmm
+3 -3
View File
@@ -3464,9 +3464,9 @@
/area/awaymission/UO71/science)
"hI" = (
/obj/structure/table/glass,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/turf/simulated/floor/plasteel{
_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
+3 -3
View File
@@ -5002,9 +5002,9 @@
})
"il" = (
/obj/structure/table/glass,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/turf/simulated/floor/plasteel{
_maps/map_files/cyberiad/cyberiad.dmm
+3 -3
View File
@@ -50631,9 +50631,9 @@
d2 = 8;
icon_state = "0-8"
},
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/console_screen,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/obj/structure/table/glass,
code/game/dna/dna_modifier.dm
+2 -2
View File
@@ -75,7 +75,7 @@
component_parts += new /obj/item/stock_parts/scanning_module(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -87,7 +87,7 @@
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
code/game/machinery/Freezer.dm
+4 -4
View File
@@ -20,7 +20,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -32,7 +32,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -184,7 +184,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(src)
component_parts += new /obj/item/stock_parts/micro_laser(src)
component_parts += new /obj/item/stock_parts/micro_laser(src)
component_parts += new /obj/item/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/sheet/glass(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
@@ -199,7 +199,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(src)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/sheet/glass(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
code/game/machinery/Sleeper.dm
+6 -6
View File
@@ -46,8 +46,8 @@
component_parts += B
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -57,8 +57,8 @@
component_parts += new /obj/item/circuitboard/sleeper(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -534,8 +534,8 @@
B.rating = initial_bin_rating
component_parts += B
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
code/game/machinery/adv_med.dm
+2 -2
View File
@@ -34,8 +34,8 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/bodyscanner(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
code/game/machinery/autolathe.dm
+2 -2
View File
@@ -46,7 +46,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
wires = new(src)
@@ -61,7 +61,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/autolathe/Destroy()
code/game/machinery/cloning.dm
+2 -2
View File
@@ -64,7 +64,7 @@
component_parts += new /obj/item/stock_parts/scanning_module(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -78,7 +78,7 @@
component_parts += new /obj/item/stock_parts/scanning_module/phasic(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
component_parts += new /obj/item/stack/cable_coil(null, 1)
biomass = CLONE_BIOMASS
code/game/machinery/constructable_frame.dm
+24 -24
View File
@@ -324,7 +324,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stack/cable_coil = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
@@ -367,7 +367,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/plantgenes
name = "Plant DNA Manipulator (Machine Board)"
@@ -378,7 +378,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/scanning_module = 1)
/obj/item/circuitboard/plantgenes/vault
@@ -402,7 +402,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/microwave
name = "circuit board (Microwave)"
@@ -413,7 +413,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/oven
name = "circuit board (Oven)"
@@ -424,7 +424,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stack/cable_coil = 5,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/grill
name = "circuit board (Grill)"
@@ -435,7 +435,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stack/cable_coil = 5,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/candy_maker
name = "circuit board (Candy Maker)"
@@ -446,7 +446,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/cable_coil = 5,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/deepfryer
name = "circuit board (Deep Fryer)"
@@ -570,7 +570,7 @@ to destroy them and players will be able to make replacements.
req_components = list( /obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell = 1)
/obj/item/circuitboard/chem_master
@@ -581,7 +581,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/reagent_containers/glass/beaker = 2,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/chem_master/attackby(obj/item/I, mob/user, params)
if(isscrewdriver(I))
@@ -610,7 +610,7 @@ to destroy them and players will be able to make replacements.
frame_desc = "Requires 1 Micro Laser and 1 Console Screen."
req_components = list(
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/reagentgrinder
name = "circuit board (All-In-One Grinder)"
@@ -653,7 +653,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/matter_bin = 3,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/protolathe
name = "Circuit board (Protolathe)"
@@ -727,7 +727,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/podfab
name = "Circuit board (Spacepod Fabricator)"
@@ -739,7 +739,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/clonepod
@@ -752,7 +752,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stack/cable_coil = 2,
/obj/item/stock_parts/scanning_module = 2,
/obj/item/stock_parts/manipulator = 2,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/clonescanner
name = "Circuit board (Cloning Scanner)"
@@ -764,7 +764,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/scanning_module = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stack/cable_coil = 2,)
/obj/item/circuitboard/mech_recharger
@@ -796,7 +796,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stack/ore/bluespace_crystal = 2,
/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/teleporter_perma
name = "circuit board (Permanent Teleporter)"
@@ -828,7 +828,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stack/ore/bluespace_crystal = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stock_parts/console_screen = 1)
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/quantumpad
name = "circuit board (Quantum Pad)"
@@ -852,7 +852,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stock_parts/console_screen = 2)
/obj/item/stack/sheet/glass = 2)
/obj/item/circuitboard/sleeper/syndicate
name = "circuit board (Sleeper Syndicate)"
@@ -872,7 +872,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/scanning_module = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/stock_parts/console_screen = 2)
/obj/item/stack/sheet/glass = 2)
/obj/item/circuitboard/cryo_tube
name = "circuit board (Cryotube)"
@@ -883,7 +883,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stock_parts/console_screen = 4)
/obj/item/stack/sheet/glass = 4)
/obj/item/circuitboard/cyborgrecharger
name = "circuit board (Cyborg Recharger)"
@@ -986,7 +986,7 @@ to destroy them and players will be able to make replacements.
board_type = "machine"
origin_tech = "programming=1;engineering=2"
req_components = list(
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/manipulator = 1,
@@ -1002,7 +1002,7 @@ to destroy them and players will be able to make replacements.
board_type = "machine"
origin_tech = "programming=1;engineering=3"
req_components = list(
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/matter_bin = 3)
/obj/item/circuitboard/mining_equipment_vendor/golem
@@ -1028,7 +1028,7 @@ to destroy them and players will be able to make replacements.
req_components = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stack/cable_coil = 1)
/obj/item/circuitboard/gameboard
code/game/machinery/cryo.dm
+8 -8
View File
@@ -36,10 +36,10 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/cryo_tube(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -48,10 +48,10 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/cryo_tube(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
code/game/machinery/teleporter.dm
+1 -1
View File
@@ -481,7 +481,7 @@
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
link_console_and_hub()
code/game/machinery/vending.dm
+1 -1
View File
@@ -1590,7 +1590,7 @@
/obj/item/crowbar = 12,/obj/item/wirecutters = 12,/obj/item/multitool = 12,/obj/item/wrench = 12,/obj/item/t_scanner = 12,
/obj/item/stack/cable_coil/heavyduty = 8, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5,/obj/item/stock_parts/micro_laser = 5,
/obj/item/stock_parts/matter_bin = 5,/obj/item/stock_parts/manipulator = 5,/obj/item/stock_parts/console_screen = 5)
/obj/item/stock_parts/matter_bin = 5,/obj/item/stock_parts/manipulator = 5)
refill_canister = /obj/item/vending_refill/engineering
/obj/machinery/vending/engineering/Initialize(mapload)
code/game/mecha/mech_fabricator.dm
+3 -3
View File
@@ -49,7 +49,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
files = new /datum/research(src) //Setup the research data holder.
@@ -61,7 +61,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mecha_part_fabricator/Destroy()
@@ -473,7 +473,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mecha_part_fabricator/robot
code/game/objects/items/weapons/stock_parts.dm
-7
View File
@@ -73,13 +73,6 @@
//Rank 1
/obj/item/stock_parts/console_screen
name = "console screen"
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = "materials=1"
materials = list(MAT_GLASS=200)
/obj/item/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
code/modules/arcade/prize_counter.dm
+1 -1
View File
@@ -17,7 +17,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/prize_counter/update_icon()
code/modules/food_and_drinks/kitchen_machinery/candy_maker.dm
+2 -2
View File
@@ -23,7 +23,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/candy_maker(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
@@ -32,7 +32,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/candy_maker(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+2 -2
View File
@@ -24,7 +24,7 @@
component_parts += new /obj/item/circuitboard/grill(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
@@ -34,7 +34,7 @@
component_parts += new /obj/item/circuitboard/grill(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+2 -2
View File
@@ -24,7 +24,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/microwave(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
@@ -33,7 +33,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/microwave(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
RefreshParts()
code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+2 -2
View File
@@ -24,7 +24,7 @@
component_parts += new /obj/item/circuitboard/oven(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
@@ -34,7 +34,7 @@
component_parts += new /obj/item/circuitboard/oven(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 5)
RefreshParts()
code/modules/hydroponics/biogenerator.dm
+1 -1
View File
@@ -26,7 +26,7 @@
component_parts += new /obj/item/circuitboard/biogenerator(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
code/modules/hydroponics/gene_modder.dm
+2 -2
View File
@@ -27,7 +27,7 @@
..()
component_parts = list()
component_parts += new /obj/item/circuitboard/plantgenes(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
@@ -37,7 +37,7 @@
..()
component_parts = list()
component_parts += new /obj/item/circuitboard/plantgenes/vault(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stock_parts/scanning_module(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -57,7 +57,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/hydroponics/constructable/RefreshParts()
code/modules/mining/equipment/survival_pod.dm
+2 -2
View File
@@ -154,8 +154,8 @@
B.rating = initial_bin_rating
component_parts += B
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
code/modules/mining/machine_redemption.dm
+3 -3
View File
@@ -36,7 +36,7 @@
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/assembly/igniter(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/upgraded/New()
@@ -47,7 +47,7 @@
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/assembly/igniter(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/golem
@@ -62,7 +62,7 @@
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/assembly/igniter(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/ore_redemption/Destroy()
code/modules/mining/machine_vending.dm
+2 -2
View File
@@ -71,7 +71,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/equipment_vendor/golem/Initialize()
@@ -107,7 +107,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/mineral/equipment_vendor/power_change()
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+7 -7
View File
@@ -36,7 +36,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
RefreshParts()
dispensable_reagents = sortList(dispensable_reagents)
@@ -49,7 +49,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null)
RefreshParts()
@@ -82,7 +82,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null)
RefreshParts()
@@ -342,7 +342,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
RefreshParts()
@@ -354,7 +354,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
RefreshParts()
@@ -377,7 +377,7 @@
component_parts += new /obj/item/stock_parts/matter_bin(null)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
RefreshParts()
@@ -389,6 +389,6 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
RefreshParts()
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -16,7 +16,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_heater(null)
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
/obj/machinery/chem_heater/process()
code/modules/reagents/chemistry/machinery/chem_master.dm
+2 -2
View File
@@ -25,7 +25,7 @@
component_parts = list()
component_parts += new /obj/item/circuitboard/chem_master(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/reagent_containers/glass/beaker(null)
component_parts += new /obj/item/reagent_containers/glass/beaker(null)
RefreshParts()
@@ -488,7 +488,7 @@
QDEL_LIST(component_parts)
component_parts += new /obj/item/circuitboard/chem_master/condi_master(null)
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/reagent_containers/glass/beaker(null)
component_parts += new /obj/item/reagent_containers/glass/beaker(null)
RefreshParts()
code/modules/research/designs/autolathe_designs.dm
-8
View File
@@ -123,14 +123,6 @@
build_path = /obj/item/storage/toolbox
category = list("initial","Tools")
/datum/design/console_screen
name = "Console Screen"
id = "console_screen"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 200)
build_path = /obj/item/stock_parts/console_screen
category = list("initial", "Electronics")
/datum/design/apc_board
name = "APC module"
id = "power control"
code/modules/telesci/telepad.dm
+2 -2
View File
@@ -16,7 +16,7 @@
component_parts += new /obj/item/circuitboard/telesci_pad(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)
component_parts += new /obj/item/stock_parts/capacitor(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
@@ -26,7 +26,7 @@
component_parts += new /obj/item/circuitboard/telesci_pad(null)
component_parts += new /obj/item/stack/ore/bluespace_crystal/artificial(null, 2)
component_parts += new /obj/item/stock_parts/capacitor/super(null)
component_parts += new /obj/item/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
icons/obj/stock_parts.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB