shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-37486

Browse Source
This commit is contained in:
deathride58
2018-05-06 07:15:48 +00:00
committed by GitHub
parent f46a77ba5c 11c1e8fbf7
commit 50f8779fc0
727 changed files with 10369 additions and 18653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+27 -27
View File
@@ -23,7 +23,7 @@
id = "flashlight"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 20)
build_path = /obj/item/device/flashlight
build_path = /obj/item/flashlight
category = list("initial","Tools")
/datum/design/extinguisher
@@ -39,7 +39,7 @@
id = "multitool"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 20)
build_path = /obj/item/device/multitool
build_path = /obj/item/multitool
category = list("initial","Tools")
/datum/design/analyzer
@@ -47,7 +47,7 @@
id = "analyzer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
build_path = /obj/item/device/analyzer
build_path = /obj/item/analyzer
category = list("initial","Tools")
/datum/design/tscanner
@@ -55,7 +55,7 @@
id = "tscanner"
build_type = AUTOLATHE
materials = list(MAT_METAL = 150)
build_path = /obj/item/device/t_scanner
build_path = /obj/item/t_scanner
category = list("initial","Tools")
/datum/design/weldingtool
@@ -168,7 +168,7 @@
id = "camera"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 100)
build_path = /obj/item/device/camera
build_path = /obj/item/camera
category = list("initial", "Misc")
/datum/design/camera_film
@@ -176,7 +176,7 @@
id = "camera_film"
build_type = AUTOLATHE
materials = list(MAT_METAL = 10, MAT_GLASS = 10)
build_path = /obj/item/device/camera_film
build_path = /obj/item/camera_film
category = list("initial", "Misc")
/datum/design/earmuffs
@@ -192,7 +192,7 @@
id = "pipe_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
build_path = /obj/item/device/pipe_painter
build_path = /obj/item/pipe_painter
category = list("initial", "Misc")
/datum/design/airlock_painter
@@ -316,7 +316,7 @@
id = "plant_analyzer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
build_path = /obj/item/device/plant_analyzer
build_path = /obj/item/plant_analyzer
category = list("initial","Misc")
/datum/design/shovel
@@ -420,7 +420,7 @@
id = "healthanalyzer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
build_path = /obj/item/device/healthanalyzer
build_path = /obj/item/healthanalyzer
category = list("initial", "Medical")
/datum/design/pillbottle
@@ -451,7 +451,7 @@
name = "Speed Loader (.38)"
id = "c38"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30000)
materials = list(MAT_METAL = 20000)
build_path = /obj/item/ammo_box/c38
category = list("initial", "Security")
@@ -460,7 +460,7 @@
id = "recorder"
build_type = AUTOLATHE
materials = list(MAT_METAL = 60, MAT_GLASS = 30)
build_path = /obj/item/device/taperecorder/empty
build_path = /obj/item/taperecorder/empty
category = list("initial", "Misc")
/datum/design/tape
@@ -468,7 +468,7 @@
id = "tape"
build_type = AUTOLATHE
materials = list(MAT_METAL = 20, MAT_GLASS = 5)
build_path = /obj/item/device/tape/random
build_path = /obj/item/tape/random
category = list("initial", "Misc")
/datum/design/igniter
@@ -476,7 +476,7 @@
id = "igniter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
build_path = /obj/item/device/assembly/igniter
build_path = /obj/item/assembly/igniter
category = list("initial", "Misc")
/datum/design/signaler
@@ -484,7 +484,7 @@
id = "signaler"
build_type = AUTOLATHE
materials = list(MAT_METAL = 400, MAT_GLASS = 120)
build_path = /obj/item/device/assembly/signaler
build_path = /obj/item/assembly/signaler
category = list("initial", "T-Comm")
/datum/design/radio_headset
@@ -492,7 +492,7 @@
id = "radio_headset"
build_type = AUTOLATHE
materials = list(MAT_METAL = 75)
build_path = /obj/item/device/radio/headset
build_path = /obj/item/radio/headset
category = list("initial", "T-Comm")
/datum/design/bounced_radio
@@ -500,7 +500,7 @@
id = "bounced_radio"
build_type = AUTOLATHE
materials = list(MAT_METAL = 75, MAT_GLASS = 25)
build_path = /obj/item/device/radio/off
build_path = /obj/item/radio/off
category = list("initial", "T-Comm")
/datum/design/intercom_frame
@@ -516,7 +516,7 @@
id = "infrared_emitter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 500)
build_path = /obj/item/device/assembly/infra
build_path = /obj/item/assembly/infra
category = list("initial", "Misc")
/datum/design/health_sensor
@@ -524,7 +524,7 @@
id = "health_sensor"
build_type = AUTOLATHE
materials = list(MAT_METAL = 800, MAT_GLASS = 200)
build_path = /obj/item/device/assembly/health
build_path = /obj/item/assembly/health
category = list("initial", "Medical")
/datum/design/timer
@@ -532,7 +532,7 @@
id = "timer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
build_path = /obj/item/device/assembly/timer
build_path = /obj/item/assembly/timer
category = list("initial", "Misc")
/datum/design/voice_analyser
@@ -540,7 +540,7 @@
id = "voice_analyser"
build_type = AUTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
build_path = /obj/item/device/assembly/voice
build_path = /obj/item/assembly/voice
category = list("initial", "Misc")
/datum/design/light_tube
@@ -588,7 +588,7 @@
id = "prox_sensor"
build_type = AUTOLATHE
materials = list(MAT_METAL = 800, MAT_GLASS = 200)
build_path = /obj/item/device/assembly/prox_sensor
build_path = /obj/item/assembly/prox_sensor
category = list("initial", "Misc")
/datum/design/foam_dart
@@ -629,7 +629,7 @@
id = "electropack"
build_type = AUTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 2500)
build_path = /obj/item/device/electropack
build_path = /obj/item/electropack
category = list("hacked", "Tools")
/datum/design/large_welding_tool
@@ -757,7 +757,7 @@
id = "desttagger"
build_type = AUTOLATHE
materials = list(MAT_METAL = 250, MAT_GLASS = 125)
build_path = /obj/item/device/destTagger
build_path = /obj/item/destTagger
category = list("initial", "Electronics")
/datum/design/handlabeler
@@ -773,7 +773,7 @@
id = "geigercounter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
build_path = /obj/item/device/geiger_counter
build_path = /obj/item/geiger_counter
category = list("initial", "Tools")
/datum/design/turret_control_frame
@@ -805,7 +805,7 @@
id = "laptop"
build_type = AUTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 1000)
build_path = /obj/item/device/modular_computer/laptop/buildable
build_path = /obj/item/modular_computer/laptop/buildable
category = list("initial","Misc")
/datum/design/tablet
@@ -813,7 +813,7 @@
id = "tablet"
build_type = AUTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/device/modular_computer/tablet
build_path = /obj/item/modular_computer/tablet
category = list("initial","Misc")
/datum/design/slime_scanner
@@ -821,7 +821,7 @@
id = "slime_scanner"
build_type = AUTOLATHE
materials = list(MAT_METAL = 300, MAT_GLASS = 200)
build_path = /obj/item/device/slime_scanner
build_path = /obj/item/slime_scanner
category = list("initial", "Misc")
/datum/design/pet_carrier
code/modules/research/designs/bluespace_designs.dm
+2 -2
View File
@@ -9,7 +9,7 @@
id = "beacon"
build_type = PROTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/device/beacon
build_path = /obj/item/beacon
category = list("Bluespace Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY
@@ -40,7 +40,7 @@
id = "telesci_gps"
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 1000)
build_path = /obj/item/device/gps
build_path = /obj/item/gps
category = list("Bluespace Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
code/modules/research/designs/comp_board_designs.dm
-8
View File
@@ -222,14 +222,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/board/stockexchange
name = "Computer Design (Stock Exchange Console)"
desc = "Allows for the construction of circuit boards used to build a Stock Exchange Console."
id = "stockexchange"
build_path = /obj/item/circuitboard/computer/stockexchange
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/board/mining
name = "Computer Design (Outpost Status Display)"
desc = "Allows for the construction of circuit boards used to build an outpost status display console."
code/modules/research/designs/electronics_designs.dm
+3 -3
View File
@@ -9,7 +9,7 @@
id = "intellicard"
build_type = PROTOLATHE
materials = list(MAT_GLASS = 1000, MAT_GOLD = 200)
build_path = /obj/item/device/aicard
build_path = /obj/item/aicard
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -19,7 +19,7 @@
id = "paicard"
build_type = PROTOLATHE
materials = list(MAT_GLASS = 500, MAT_METAL = 500)
build_path = /obj/item/device/paicard
build_path = /obj/item/paicard
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_ALL
@@ -62,7 +62,7 @@
id = "icprinter"
build_type = PROTOLATHE
materials = list(MAT_GLASS = 5000, MAT_METAL = 10000)
build_path = /obj/item/device/integrated_circuit_printer
build_path = /obj/item/integrated_circuit_printer
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
code/modules/research/designs/equipment_designs.dm
+1 -1
View File
@@ -14,7 +14,7 @@
desc = "An advanced back-worn system that has dual ion engines powerful enough to grant a humanoid flight. Contains an internal self-recharging high-current capacitor for short, powerful boosts."
id = "flightpack"
build_type = PROTOLATHE
build_path = /obj/item/device/flightpack
build_path = /obj/item/flightpack
materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 4000, MAT_GOLD = 12000, MAT_SILVER = 12000, MAT_URANIUM = 20000, MAT_PLASMA = 16000, MAT_TITANIUM = 16000) //This expensive enough for you?
construction_time = 250
category = list("Misc")
code/modules/research/designs/limbgrower_designs.dm
+4 -4
View File
@@ -8,7 +8,7 @@
build_type = LIMBGROWER
reagents_list = list("synthflesh" = 25)
build_path = /obj/item/bodypart/l_arm
category = list("initial","human","lizard","plasmaman")
category = list("initial","human","lizard","fly","moth","plasmaman")
/datum/design/rightarm
name = "Right Arm"
@@ -16,7 +16,7 @@
build_type = LIMBGROWER
reagents_list = list("synthflesh" = 25)
build_path = /obj/item/bodypart/r_arm
category = list("initial","human","lizard","plasmaman")
category = list("initial","human","lizard","fly","moth","plasmaman")
/datum/design/leftleg
name = "Left Leg"
@@ -24,7 +24,7 @@
build_type = LIMBGROWER
reagents_list = list("synthflesh" = 25)
build_path = /obj/item/bodypart/l_leg
category = list("initial","human","lizard","plasmaman")
category = list("initial","human","lizard","fly","moth","plasmaman")
/datum/design/rightleg
name = "Right Leg"
@@ -32,7 +32,7 @@
build_type = LIMBGROWER
reagents_list = list("synthflesh" = 25)
build_path = /obj/item/bodypart/r_leg
category = list("initial","human","lizard","plasmaman")
category = list("initial","human","lizard","fly","moth","plasmaman")
/datum/design/armblade
name = "Arm Blade"
code/modules/research/designs/machine_designs.dm
+3 -11
View File
@@ -323,12 +323,12 @@
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/processor
name = "Machine Design (Food Processor Board)"
desc = "The circuit board for a food processor."
name = "Machine Design (Food/Slime Processor Board)"
desc = "The circuit board for a processing unit. Screwdrive the circuit to switch between food (default) or slime processing."
id = "processor"
build_path = /obj/item/circuitboard/machine/processor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/soda_dispenser
name = "Machine Design (Portable Soda Dispenser Board)"
@@ -346,14 +346,6 @@
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
category = list ("Misc. Machinery")
/datum/design/board/slimeprocessor
name = "Machine Design (Slime Processor Board)"
desc = "The circuit board for a slime processor."
id = "slimeprocessor"
build_path = /obj/item/circuitboard/machine/processor/slime
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/recycler
name = "Machine Design (Recycler Board)"
desc = "The circuit board for a recycler."
code/modules/research/designs/mechfabricator_designs.dm
+1 -1
View File
@@ -769,5 +769,5 @@
build_type = MECHFAB
materials = list(MAT_METAL = 750, MAT_GLASS = 750)
construction_time = 100
build_path = /obj/item/device/assembly/flash/handheld
build_path = /obj/item/assembly/flash/handheld
category = list("Misc")
code/modules/research/designs/medical_designs.dm
+3 -3
View File
@@ -9,7 +9,7 @@
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 1000, MAT_GLASS = 500)
construction_time = 75
build_path = /obj/item/device/mmi
build_path = /obj/item/mmi
category = list("Misc","Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -20,7 +20,7 @@
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 1700, MAT_GLASS = 1350, MAT_GOLD = 500) //Gold, because SWAG.
construction_time = 75
build_path = /obj/item/device/mmi/posibrain
build_path = /obj/item/mmi/posibrain
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -118,7 +118,7 @@
id = "plasmarefiller" //Why did this have no plasmatech
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_PLASMA = 1000)
build_path = /obj/item/device/extinguisher_refill
build_path = /obj/item/extinguisher_refill
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_ALL
code/modules/research/designs/misc_designs.dm
+31 -1
View File
@@ -241,7 +241,7 @@
name = "Alien Multitool"
desc = "An advanced multitool obtained through Abductor technology."
id = "alien_multitool"
build_path = /obj/item/device/multitool/abductor
build_path = /obj/item/multitool/abductor
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 5000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000)
category = list("Equipment")
@@ -310,6 +310,36 @@
build_path = /obj/item/holosign_creator
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/holosignsec
name = "Security Holobarrier Projector"
desc = "A holographic projector that creates holographic security barriers."
id = "holosignsec"
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_SILVER = 1000)
build_path = /obj/item/holosign_creator/security
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/holosignengi
name = "Engineering Holobarrier Projector"
desc = "A holographic projector that creates holographic engineering barriers."
id = "holosignengi"
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_SILVER = 1000)
build_path = /obj/item/holosign_creator/engineering
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/holosignatmos
name = "ATMOS Holofan Projector"
desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric conditions."
id = "holosignatmos"
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_SILVER = 1000)
build_path = /obj/item/holosign_creator/atmos
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/////////////////////////////////////////
////////////Tools//////////////
code/modules/research/designs/power_designs.dm
+1 -1
View File
@@ -63,7 +63,7 @@
id = "light_replacer"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000)
build_path = /obj/item/device/lightreplacer
build_path = /obj/item/lightreplacer
category = list("Power Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
code/modules/research/designs/weapon_designs.dm
+2 -2
View File
@@ -44,7 +44,7 @@
id = "pin_testing"
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 300)
build_path = /obj/item/device/firing_pin/test_range
build_path = /obj/item/firing_pin/test_range
category = list("Firing Pins")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -54,7 +54,7 @@
id = "pin_loyalty"
build_type = PROTOLATHE
materials = list(MAT_SILVER = 600, MAT_DIAMOND = 600, MAT_URANIUM = 200)
build_path = /obj/item/device/firing_pin/implant/mindshield
build_path = /obj/item/firing_pin/implant/mindshield
category = list("Firing Pins")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
code/modules/research/experimentor.dm
+3 -3
View File
@@ -63,7 +63,7 @@
valid_items += rand(1,max(2,35-probWeight))
valid_items += I
if(ispath(I, /obj/item/construction/rcd) || ispath(I, /obj/item/grenade) || ispath(I, /obj/item/device/aicard) || ispath(I, /obj/item/storage/backpack/holding) || ispath(I, /obj/item/slime_extract) || ispath(I, /obj/item/device/onetankbomb) || ispath(I, /obj/item/device/transfer_valve))
if(ispath(I, /obj/item/construction/rcd) || ispath(I, /obj/item/grenade) || ispath(I, /obj/item/aicard) || ispath(I, /obj/item/storage/backpack/holding) || ispath(I, /obj/item/slime_extract) || ispath(I, /obj/item/onetankbomb) || ispath(I, /obj/item/transfer_valve))
var/obj/item/tempCheck = I
if(initial(tempCheck.icon_state) != null)
critical_items += I
@@ -86,8 +86,8 @@
/obj/machinery/rnd/experimentor/proc/checkCircumstances(obj/item/O)
//snowflake check to only take "made" bombs
if(istype(O, /obj/item/device/transfer_valve))
var/obj/item/device/transfer_valve/T = O
if(istype(O, /obj/item/transfer_valve))
var/obj/item/transfer_valve/T = O
if(!T.tank_one || !T.tank_two || !T.attached_device)
return FALSE
return TRUE
code/modules/research/machinery/departmental_circuit_imprinter.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department
name = "Department Circuit Imprinter"
desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
name = "department circuit imprinter"
desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "circuit_imprinter"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
@@ -8,6 +8,6 @@
consoleless_interface = TRUE
/obj/machinery/rnd/production/circuit_imprinter/department/science
name = "department protolathe (Science)"
name = "department circuit imprinter (Science)"
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
department_tag = "Science"
code/modules/research/machinery/departmental_protolathe.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/protolathe/department
name = "department protolathe"
desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "protolathe"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/protolathe/department
code/modules/research/rdmachines.dm
-2
View File
@@ -43,8 +43,6 @@
if(linked_console)
disconnect_console()
return
if(exchange_parts(user, O))
return
if(default_deconstruction_crowbar(O))
return
if(is_refillable() && O.is_drainable())
code/modules/research/stock_parts.dm
+13 -2
View File
@@ -14,13 +14,24 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg'
var/alt_sound = null
/obj/item/storage/part_replacer/afterattack(obj/machinery/T, mob/living/carbon/human/user, flag, params)
/obj/item/storage/part_replacer/pre_attack(obj/machinery/T, mob/living/user, params)
if(!istype(T) || !T.component_parts)
return ..()
if(works_from_distance || user.Adjacent(T))
if(user.Adjacent(T)) // no TK upgrading.
if(works_from_distance)
user.Beam(T, icon_state = "rped_upgrade", time = 5)
T.exchange_parts(user, src)
return FALSE
return ..()
/obj/item/storage/part_replacer/afterattack(obj/machinery/T, mob/living/user, adjacent, params)
if(adjacent || !istype(T) || !T.component_parts)
return ..()
if(works_from_distance)
user.Beam(T, icon_state = "rped_upgrade", time = 5)
T.exchange_parts(user, src)
return
return ..()
/obj/item/storage/part_replacer/proc/play_rped_sound()
//Plays the sound for RPED exhanging or installing parts.
code/modules/research/techweb/all_nodes.dm
+9 -9
View File
@@ -282,7 +282,7 @@
display_name = "Electromagnetic Theory"
description = "Study into usage of frequencies in the electromagnetic spectrum."
prereq_ids = list("base")
design_ids = list("holosign", "inducer", "tray_goggles", "holopad")
design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "inducer", "tray_goggles", "holopad")
research_cost = 2500
export_price = 5000
@@ -321,7 +321,7 @@
display_name = "Computer Consoles"
description = "Computers and how they work."
prereq_ids = list("datatheory")
design_ids = list("cargo", "cargorequest", "stockexchange", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcardconsole", "seccamera")
design_ids = list("cargo", "cargorequest", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcardconsole", "seccamera")
research_cost = 2000
export_price = 5000
@@ -830,8 +830,8 @@
description = "Things used by the greys."
prereq_ids = list("biotech","engineering")
boost_item_paths = list(/obj/item/gun/energy/alien = 0, /obj/item/scalpel/alien = 0, /obj/item/hemostat/alien = 0, /obj/item/retractor/alien = 0, /obj/item/circular_saw/alien = 0,
/obj/item/cautery/alien = 0, /obj/item/surgicaldrill/alien = 0, /obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/device/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/device/abductor = 0)
/obj/item/cautery/alien = 0, /obj/item/surgicaldrill/alien = 0, /obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/abductor = 0)
research_cost = 5000
export_price = 20000
hidden = TRUE
@@ -844,8 +844,8 @@
prereq_ids = list("alientech", "adv_biotech")
design_ids = list("alien_scalpel", "alien_hemostat", "alien_retractor", "alien_saw", "alien_drill", "alien_cautery")
boost_item_paths = list(/obj/item/gun/energy/alien = 0, /obj/item/scalpel/alien = 0, /obj/item/hemostat/alien = 0, /obj/item/retractor/alien = 0, /obj/item/circular_saw/alien = 0,
/obj/item/cautery/alien = 0, /obj/item/surgicaldrill/alien = 0, /obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/device/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/device/abductor = 0)
/obj/item/cautery/alien = 0, /obj/item/surgicaldrill/alien = 0, /obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/abductor = 0)
research_cost = 2500
export_price = 20000
hidden = TRUE
@@ -856,8 +856,8 @@
description = "Alien engineering tools"
prereq_ids = list("alientech", "adv_engi")
design_ids = list("alien_wrench", "alien_wirecutters", "alien_screwdriver", "alien_crowbar", "alien_welder", "alien_multitool")
boost_item_paths = list(/obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/device/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/device/abductor = 0)
boost_item_paths = list(/obj/item/screwdriver/abductor = 0, /obj/item/wrench/abductor = 0, /obj/item/crowbar/abductor = 0, /obj/item/multitool/abductor = 0,
/obj/item/weldingtool/abductor = 0, /obj/item/wirecutters/abductor = 0, /obj/item/circuitboard/machine/abductor = 0, /obj/item/abductor_baton = 0, /obj/item/abductor = 0)
research_cost = 2500
export_price = 20000
hidden = TRUE
@@ -867,7 +867,7 @@
display_name = "Illegal Technology"
description = "Dangerous research used to create dangerous objects."
prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons")
design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow")
design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor")
research_cost = 10000
export_price = 5000
hidden = TRUE
code/modules/research/xenobiology/crossbreeding/burning.dm
+3 -3
View File
@@ -155,7 +155,7 @@ Burning extracts:
/obj/item/slimecross/burning/sepia/do_effect(mob/user)
user.visible_message("<span class='notice'>[src] shapes itself into a camera!</span>")
new /obj/item/device/camera/timefreeze(get_turf(user))
new /obj/item/camera/timefreeze(get_turf(user))
..()
/obj/item/slimecross/burning/cerulean
@@ -290,13 +290,13 @@ Burning extracts:
//Misc. things added
/obj/item/device/camera/timefreeze
/obj/item/camera/timefreeze
name = "sepia-tinted camera"
desc = "They say a picture is like a moment stopped in time."
pictures_left = 1
pictures_max = 1
/obj/item/device/camera/timefreeze/afterattack(atom/target, mob/user, flag)
/obj/item/camera/timefreeze/afterattack(atom/target, mob/user, flag)
if(!on || !pictures_left || !isturf(target.loc))
return
new /obj/effect/timestop(get_turf(target), 2, 50, list(user))
code/modules/research/xenobiology/crossbreeding/charged.dm
+1 -1
View File
@@ -122,7 +122,7 @@ Charged extracts:
colour = "sepia"
/obj/item/slimecross/charged/sepia/do_effect(mob/user)
new /obj/item/device/camera/spooky(get_turf(user))
new /obj/item/camera/spooky(get_turf(user))
user.visible_message("<span class='notice'>[src] flickers in a strange, ethereal manner, and produces a camera!</span>")
..()
code/modules/research/xenobiology/crossbreeding/industrial.dm
+1 -1
View File
@@ -124,7 +124,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/sepia
colour = "sepia"
plasmarequired = 2
itempath = /obj/item/device/camera
itempath = /obj/item/camera
/obj/item/slimecross/industrial/cerulean
colour = "cerulean"
code/modules/research/xenobiology/xenobiology.dm
+1 -1
View File
@@ -570,7 +570,7 @@
/obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
var/obj/item/device/camera/O = new(null, 1)
var/obj/item/camera/O = new(null, 1)
if(!user.put_in_active_hand(O))
O.forceMove(user.drop_location())
playsound(user, 'sound/effects/splat.ogg', 50, 1)