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

Engineering and Atmos Mapping QoL and Tweaks (#14625)

Browse Source
This commit is contained in:
SleepyGemmy
2022-08-21 19:44:31 +02:00
committed by GitHub
parent ddc43fc735
commit d565b72f1d
23 changed files with 4534 additions and 3145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/radio.dm
+51 -19
View File
@@ -1,8 +1,9 @@
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
// Access check is of the type "req_one_access".
// These have been carefully selected to avoid allowing anyone with generic departmental access to see channels they should not.
var/global/list/default_internal_channels = list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
@@ -22,6 +23,10 @@ var/global/list/default_medbay_channels = list(
num2text(MED_I_FREQ) = list(access_medical_equip)
)
//
// Radios
//
/obj/item/device/radio
icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
@@ -625,22 +630,9 @@ var/global/list/default_medbay_channels = list(
channels[ch_name] = 0
..()
/obj/item/device/radio/med
icon_state = "walkietalkie-med"
/obj/item/device/radio/sec
icon_state = "walkietalkie-sec"
/obj/item/device/radio/eng
icon_state = "walkietalkie-eng"
/obj/item/device/radio/sci
icon_state = "walkietalkie-sci"
///////////////////////////////
//////////Borg Radios//////////
///////////////////////////////
//Giving borgs their own radio to have some more room to work with -Sieve
//
// Vesselbound Synthetic Radio
//
/obj/item/device/radio/borg
var/mob/living/silicon/robot/myborg = null // Cyborg which owns this radio. Used for power checks
@@ -814,9 +806,47 @@ var/global/list/default_medbay_channels = list(
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
return
//
// Radio Variants
//
// Radio (Off)
/obj/item/device/radio/off
listening = FALSE
// Medical
/obj/item/device/radio/med
icon_state = "walkietalkie-med"
// Medical (Off)
/obj/item/device/radio/med/off
listening = FALSE
// Security
/obj/item/device/radio/sec
icon_state = "walkietalkie-sec"
// Security (Off)
/obj/item/device/radio/sec/off
listening = FALSE
// Engineering
/obj/item/device/radio/eng
icon_state = "walkietalkie-eng"
// Engineering (Off)
/obj/item/device/radio/eng/off
listening = FALSE
// Science
/obj/item/device/radio/sci
icon_state = "walkietalkie-sci"
// Science (Off)
/obj/item/device/radio/sci/off
listening = FALSE
// Phone
/obj/item/device/radio/phone
broadcasting = FALSE
icon = 'icons/obj/radio.dmi'
@@ -825,6 +855,7 @@ var/global/list/default_medbay_channels = list(
name = "phone"
var/radio_sound = null
// Medical Phone
/obj/item/device/radio/phone/medbay
frequency = MED_I_FREQ
@@ -832,6 +863,7 @@ var/global/list/default_medbay_channels = list(
. = ..()
internal_channels = default_medbay_channels.Copy()
// All-channel Radio
/obj/item/device/radio/all_channels/Initialize()
channels = ALL_RADIO_CHANNELS.Copy()
. = ..()
. = ..()
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -1
View File
@@ -202,7 +202,7 @@
throw_range = 10
flags = CONDUCT
/obj/item/stack/tile/floor/full/Initialize(mapload)
/obj/item/stack/tile/floor/full_stack/Initialize(mapload)
. = ..()
amount = max_amount
update_icon()
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+93 -80
View File
@@ -1,102 +1,63 @@
//
// Secure Engineering Lockers and Closets
//
// Chief Engineer
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(access_ce)
icon_state = "ce"
anchored = TRUE
canbemoved = TRUE
req_access = list(access_ce)
/obj/structure/closet/secure_closet/engineering_chief/fill()
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/satchel/locker_clothing/ce(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/device/megaphone/engi(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest/ce(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/device/multitool(src)
new /obj/item/device/flash(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/accessory/storage/overalls/chief(src)
new /obj/item/rfd/piping(src)
new /obj/item/storage/box/fancy/keypouch/eng(src)
new /obj/item/gun/energy/disruptorpistol/miniature(src)
new /obj/item/device/gps/engineering(src)
new /obj/item/pipewrench(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/crowbar/rescue_axe/red(src)
new /obj/item/device/radio/eng/off(src)
/obj/structure/closet/secure_closet/engineering_chief2
name = "chief engineer's attire"
req_access = list(access_ce)
icon_state = "ce"
/obj/structure/closet/secure_closet/engineering_chief2/fill()
new /obj/item/storage/backpack/industrial(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/clothing/accessory/storage/overalls/chief(src)
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(access_engine_equip)
icon_state = "eng"
icon_door = "eng_elec"
/obj/structure/closet/secure_closet/engineering_electrical/fill()
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(access_construction)
icon_state = "eng"
icon_door = "eng_weld"
/obj/structure/closet/secure_closet/engineering_welding/fill()
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/reagent_containers/weldpack(src)
new /obj/item/reagent_containers/weldpack(src)
new /obj/item/reagent_containers/weldpack(src)
// Chief Engineer - Clothing Satchel
// This satchel is used nowhere except in conjunction with the locker above,
// thus the code is placed here rather than in the backpack code file.
/obj/item/storage/backpack/satchel/locker_clothing/ce
name = "chief engineer's clothing satchel"
desc = "A satchel filled with a chief engineer's spare clothing."
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest = 1,
/obj/item/clothing/under/rank/chief_engineer = 1,
/obj/item/clothing/head/hardhat/white = 1,
/obj/item/clothing/gloves/yellow = 1,
/obj/item/clothing/gloves/yellow/specialu = 1,
/obj/item/clothing/gloves/yellow/specialt = 1,
/obj/item/clothing/shoes/brown = 1,
/obj/item/device/radio/headset/heads/ce = 1,
/obj/item/device/radio/headset/heads/ce/alt = 1,
/obj/item/clothing/suit/storage/hazardvest/ce = 1,
/obj/item/clothing/mask/gas/alt = 1,
/obj/item/clothing/mask/gas/half = 1,
/obj/item/clothing/accessory/storage/overalls/chief = 1,
/obj/item/storage/box/fancy/keypouch/eng = 1
)
// Engineer
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(access_engine_equip)
icon_state = "eng_secure"
/obj/structure/closet/secure_closet/engineering_personal/fill()
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/storage/toolbox/mechanical(src)
@@ -107,17 +68,15 @@
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
new /obj/item/device/radio/eng/off(src)
// Atmospherics Technician
/obj/structure/closet/secure_closet/atmos_personal
name = "atmospheric technician's locker"
req_access = list(access_atmospherics)
icon_state = "atmos"
/obj/structure/closet/secure_closet/atmos_personal/fill()
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/suit/fire/atmos(src)
@@ -133,3 +92,57 @@
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
new /obj/item/reagent_containers/extinguisher_refill(src)
new /obj/item/rfd/piping(src)
new /obj/item/device/radio/eng/off(src)
// Electrical Supplies
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(access_engine_equip)
icon_state = "eng"
icon_door = "eng_elec"
/obj/structure/closet/secure_closet/engineering_electrical/fill()
// 4 Insulated Gloves (2 Xeno)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
// 3 Electrical Toolboxes
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
// 3 Power Control Boards
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
// 3 Multitools
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
// 2 Debuggers
new /obj/item/device/debugger(src)
new /obj/item/device/debugger(src)
// Welding Supplies
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(access_construction)
icon_state = "eng"
icon_door = "eng_weld"
/obj/structure/closet/secure_closet/engineering_welding/fill()
// 3 Welding Masks
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
// 3 Large Capacity Welding Tools
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
// 3 Backpack Welding Fuel Tanks
new /obj/item/reagent_containers/weldpack(src)
new /obj/item/reagent_containers/weldpack(src)
new /obj/item/reagent_containers/weldpack(src)
// 2 Welding Goggles
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/glasses/welding(src)
code/game/objects/structures/signs.dm
+5
View File
@@ -268,6 +268,11 @@
desc = "A danger sign which reads \"DANGER: HIGH VOLTAGE\"."
icon_state = "shock"
/obj/structure/sign/electricshock/tesla
name = "\improper TESLA REACTOR - DANGER: HIGH VOLTAGE sign"
desc = "A danger sign which reads \"TESLA REACTOR - DANGER: HIGH VOLTAGE\" and \"HIGH POWER MAGNETIC FIELDS IN USE\"."
icon_state = "shock"
/obj/structure/sign/fire
name = "\improper DANGER: FIRE sign"
desc = "A danger sign which reads \"DANGER: FIRE\"."