Fixes bug with custom laptops/tablets

This commit is contained in:
Atermonera
2019-05-09 09:04:46 -08:00
committed by VirgoBot
parent a174fdb084
commit 445923d699
4 changed files with 47 additions and 2 deletions

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()

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 = 7
/datum/gear/utility/customlaptop/New()
..()

View File

@@ -31,7 +31,10 @@
battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src)
battery_module.charge_to_full()
<<<<<<< HEAD
//VOREstation Add Begin
=======
>>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts
/obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
@@ -42,4 +45,7 @@
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
battery_module.charge_to_full()
<<<<<<< HEAD
//VOREstation Add End
=======
>>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts

View File

@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Novacat
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Fixes bug with custom laptops."
- tweak: "Raises cost of the elite model to 7 loadout points."