cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes mesons and material scanners from the station (#9726)

Browse Source
This commit is contained in:
Alberyk
2020-08-24 13:58:14 +02:00
committed by GitHub
parent 45c14c2863
commit 13f303ce81
22 changed files with 30 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/random_stock/t1_common.dm
+1 -7
View File
@@ -189,11 +189,6 @@ STOCK_ITEM_COMMON(wheelchair, 1)
new /obj/structure/bed/chair/wheelchair(T)
STOCK_ITEM_COMMON(meson, 1.5)
new /obj/item/clothing/glasses/meson(L)
if(prob(50))
new /obj/item/clothing/glasses/meson(L)
STOCK_ITEM_COMMON(trap, 2)
new /obj/item/trap(L)
if(prob(30))
@@ -528,8 +523,7 @@ STOCK_ITEM_COMMON(gasmask, 2)
new type(L)
STOCK_ITEM_COMMON(mining, 2)
var/list/mine_items = list(/obj/item/shovel, /obj/item/clothing/glasses/material,
/obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation)
var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation)
for(var/i in 1 to rand(1, 2))
var/to_spawn = pick(mine_items)
new to_spawn(L)
code/modules/client/preference_setup/loadout/loadout_eyes.dm
-27
View File
@@ -41,21 +41,6 @@
display_name = "science Goggles"
path = /obj/item/clothing/glasses/science
/datum/gear/eyes/materialaviators
display_name = "aviators, material"
path = /obj/item/clothing/glasses/material/aviator
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice","Shaft Miner")
/datum/gear/eyes/mesonaviators
display_name = "aviators, meson"
path = /obj/item/clothing/glasses/meson/aviator
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner")
/datum/gear/eyes/mesonprescription
display_name = "meson goggles, prescription"
path = /obj/item/clothing/glasses/meson/prescription
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner")
/datum/gear/eyes/security
display_name = "security HUD"
path = /obj/item/clothing/glasses/hud/security
@@ -115,18 +100,6 @@
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Emergency Medical Technician", "Psychiatrist", "Medical Resident")
cost = 2
/datum/gear/eyes/mespatch
display_name = "HUDpatch, Mesons"
path = /obj/item/clothing/glasses/eyepatch/hud/meson
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner")
cost = 2
/datum/gear/eyes/matpatch
display_name = "HUDpatch, Material"
path = /obj/item/clothing/glasses/eyepatch/hud/material
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Shaft Miner")
cost = 2
/datum/gear/eyes/scipatch
display_name = "HUDpatch, Science"
path = /obj/item/clothing/glasses/eyepatch/hud/science
code/modules/clothing/spacesuits/rig/suits/station.dm
+1 -4
View File
@@ -92,7 +92,6 @@
/obj/item/rig_module/device/drill,
/obj/item/rig_module/device/orescanner,
/obj/item/rig_module/device/rfd_c,
/obj/item/rig_module/vision/meson,
/obj/item/rig_module/actuators
)
@@ -127,8 +126,7 @@
initial_modules = list(
/obj/item/rig_module/device/basicdrill,
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/device/rfd_c,
/obj/item/rig_module/vision/meson
/obj/item/rig_module/device/rfd_c
)
/obj/item/clothing/gloves/rig/eva
@@ -165,7 +163,6 @@
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/device/drill,
/obj/item/rig_module/device/rfd_c,
/obj/item/rig_module/vision/meson,
/obj/item/rig_module/actuators
)
code/modules/mining/machine_rigpress.dm
-3
View File
@@ -20,9 +20,6 @@
if(!pressing)
var/outcome_path
if(istype(W, /obj/item/clothing/glasses/material) || istype (W,/obj/item/clothing/glasses/meson))
outcome_path = /obj/item/rig_module/vision/meson
if(istype(W, /obj/item/tank/jetpack))
outcome_path = /obj/item/rig_module/maneuvering_jets
code/modules/mining/machine_vending.dm
-1
View File
@@ -25,7 +25,6 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Seismic Charge", /obj/item/plastique/seismic, 25, 150),
new /datum/data/mining_equipment("Deployable Ladder", /obj/item/ladder_mobile, 5, 200),
new /datum/data/mining_equipment("Deployable Hoist Kit", /obj/item/hoist_kit, 5, 200),
new /datum/data/mining_equipment("Material Scanners", /obj/item/clothing/glasses/material, 15, 200),
new /datum/data/mining_equipment("Mining Drill", /obj/item/pickaxe/drill, 10, 200),
new /datum/data/mining_equipment("Deep Ore Scanner", /obj/item/mining_scanner, 10, 250),
new /datum/data/mining_equipment("Magboots", /obj/item/clothing/shoes/magboots, 10, 300),
code/modules/mob/living/silicon/robot/robot_modules.dm
-4
View File
@@ -356,7 +356,6 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/engineering/construction/Initialize()
. = ..()
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/powerdrill(src)
src.modules += new /obj/item/rfd/construction/borg(src)
src.modules += new /obj/item/rfd/piping/borg(src)
@@ -415,7 +414,6 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/engineering/general/Initialize()
. = ..()
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/powerdrill(src)
src.modules += new /obj/item/weldingtool/largetank(src)
src.modules += new /obj/item/screwdriver/robotic(src)
@@ -674,7 +672,6 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/miner/Initialize()
. = ..()
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/storage/bag/ore(src)
src.modules += new /obj/item/pickaxe/borgdrill(src)
src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
@@ -947,7 +944,6 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/mining_drone/proc/set_up_default(var/mob/living/silicon/robot/R, var/drill = TRUE)
modules += new /obj/item/device/flash(src)
modules += new /obj/item/borg/sight/material(src)
if(drill)
modules += new /obj/item/pickaxe/drill(src)
modules += new /obj/item/storage/bag/ore/drone(src)
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -458,7 +458,7 @@
if(M.stat == CONSCIOUS)
if (istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(istype(H.glasses,/obj/item/clothing/glasses/meson) && current_size != 11)
if(istype(H.glasses,/obj/item/clothing/glasses/safety) && current_size != 11)
to_chat(H, "<span class=\"notice\">You look directly into The [src.name], good thing you had your protective eyewear on!</span>")
return
else
code/modules/research/designs/mechfab/hardsuit/modules.dm
-7
View File
@@ -17,13 +17,6 @@
materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GOLD = 2000, MATERIAL_SILVER = 3000, MATERIAL_GLASS = 2000)
build_path = /obj/item/rig_module/power_sink
/datum/design/hardsuitmodules/meson_module
name = "Hardsuit Meson Scanner"
desc = "A layered, translucent visor system for a hardsuit."
req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000)
build_path = /obj/item/rig_module/vision/meson
/datum/design/hardsuitmodules/sechud_module
name = "Hardsuit Security HUD"
desc = "A simple tactical information system for a hardsuit."
code/modules/research/designs/protolathe/hud_glasses_designs.dm
-6
View File
@@ -9,9 +9,3 @@
/datum/design/item/hud/security
req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2)
build_path = /obj/item/clothing/glasses/hud/security
/datum/design/item/hud/mesons
desc = "These glasses make use of meson-scanning technology to allow the wearer to see through solid walls and floors."
req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50)
build_path = /obj/item/clothing/glasses/meson
code/modules/research/xenoarchaeology/misc.dm
-1
View File
@@ -99,7 +99,6 @@
new /obj/item/device/gps(src)
new /obj/item/device/beacon_locator(src)
new /obj/item/device/radio/beacon(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/pickaxe(src)
new /obj/item/device/measuring_tape(src)
new /obj/item/pickaxe/hand(src)
code/modules/supermatter/supermatter.dm
+2 -2
View File
@@ -213,7 +213,7 @@
soundloop.volume = min(100, (round(power/7)+1))
else
soundloop.volume = 0
if(damage > explosion_point)
if(!exploded)
if(!istype(L, /turf/space))
@@ -291,7 +291,7 @@
env.merge(removed)
for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on. Bad on them.
if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona() && !l.isSynthetic())
if(!istype(l.glasses, /obj/item/clothing/glasses/safety) && !l.is_diona() && !l.isSynthetic())
l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
if(prob(15))
l.cure_all_traumas(cure_type = CURE_HYPNOSIS)