cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14035 from SiliconMain/baitbegone

Browse Source 
Comments out hololocks
This commit is contained in:
silicons
2021-01-13 16:53:01 -07:00
committed by GitHub
parent a2ed0fddae 2d3e24fee4
commit bcb2e16cef
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -96,7 +96,7 @@
new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/analyzer(src) new /obj/item/analyzer(src)
new /obj/item/holosign_creator/atmos(src) new /obj/item/holosign_creator/atmos(src)
new /obj/item/holosign_creator/firelock(src) /*new /obj/item/holosign_creator/firelock(src)*/
new /obj/item/watertank/atmos(src) new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src)

4
code/modules/research/designs/misc_designs.dm
View File

@@ -481,7 +481,7 @@
build_path = /obj/item/holosign_creator/atmos build_path = /obj/item/holosign_creator/atmos
category = list("Tool Designs") category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/*
/datum/design/holosignfirelock /datum/design/holosignfirelock
name = "ATMOS Holofirelock Projector" name = "ATMOS Holofirelock Projector"
desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions." desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
@@ -491,7 +491,7 @@
build_path = /obj/item/holosign_creator/firelock build_path = /obj/item/holosign_creator/firelock
category = list("Tool Designs") category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
*/
/datum/design/holosigncombifan /datum/design/holosigncombifan
name = "ATMOS Holo-Combifan Projector" name = "ATMOS Holo-Combifan Projector"
desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions." desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions."

2
code/modules/research/techweb/nodes/misc_nodes.dm
View File

@@ -38,7 +38,7 @@
display_name = "Electromagnetic Theory" display_name = "Electromagnetic Theory"
description = "Study into usage of frequencies in the electromagnetic spectrum." description = "Study into usage of frequencies in the electromagnetic spectrum."
prereq_ids = list("base") prereq_ids = list("base")
design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "holosignfirelock", "inducer", "tray_goggles", "holopad") design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos",/* "holosignfirelock",*/ "inducer", "tray_goggles", "holopad")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/emp_adv /datum/techweb_node/emp_adv