cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 07:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-05-09 23:11:58 +01:00
parent 36292e359d 928bbbbee7
commit 9b0186a2c1
18 changed files with 1166 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+2
View File
@@ -289,6 +289,7 @@
if(ValidTeslaLinks[metadata[7]])
var/t = ValidTeslaLinks[metadata[7]]
I.tesla_link = new t(I)
I.update_verbs()
/datum/gear_tweak/laptop
var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small, /obj/item/weapon/computer_hardware/processor_unit)
@@ -437,3 +438,4 @@
if(ValidTeslaLinks[metadata[7]])
var/t = ValidTeslaLinks[metadata[7]]
I.tesla_link = new t(I)
I.update_verbs()
code/modules/client/preference_setup/loadout/loadout_utility.dm
+1 -1
View File
@@ -199,7 +199,7 @@ modular computers
/datum/gear/utility/customlaptop
display_name = "laptop computer, custom"
path = /obj/item/modular_computer/laptop/preset/
cost = 6
cost = 6 //VOREStation Edit
/datum/gear/utility/customlaptop/New()
..()