mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-21 15:42:35 +00:00
Fixes a Loadout Entry Description (#15595)
This commit is contained in:
@@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
/atom/movable/sunobj
|
/atom/movable/sunobj
|
||||||
name = "sunlight emitter"
|
name = "sunlight emitter"
|
||||||
desc = "Weren't you told to never look directly at the sun? (but seriously, you shouldn't see this)"
|
desc = DESC_PARENT
|
||||||
light_novis = TRUE
|
light_novis = TRUE
|
||||||
light_range = 16
|
light_range = 16
|
||||||
simulated = FALSE
|
simulated = FALSE
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/obj/machinery/abstract/intercom_listener
|
/obj/machinery/abstract/intercom_listener
|
||||||
name = "intercom power interface"
|
name = "intercom power interface"
|
||||||
desc = "You shouldn't see this."
|
desc = DESC_PARENT
|
||||||
power_channel = EQUIP
|
power_channel = EQUIP
|
||||||
|
|
||||||
var/obj/item/device/radio/intercom/master
|
var/obj/item/device/radio/intercom/master
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
/obj/item/surgery
|
/obj/item/surgery
|
||||||
name = "surgery tool parent item"
|
name = "surgery tool parent item"
|
||||||
desc = "This is a parent item. If you have this, please submit an issue report."
|
desc = DESC_PARENT
|
||||||
icon = 'icons/obj/surgery.dmi'
|
icon = 'icons/obj/surgery.dmi'
|
||||||
w_class = ITEMSIZE_SMALL
|
w_class = ITEMSIZE_SMALL
|
||||||
drop_sound = 'sound/items/drop/weldingtool.ogg'
|
drop_sound = 'sound/items/drop/weldingtool.ogg'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/singleton/origin_item
|
/singleton/origin_item
|
||||||
var/name = "generic origin item"
|
var/name = "generic origin item"
|
||||||
var/desc = "You shouldn't be seeing this."
|
var/desc = DESC_PARENT
|
||||||
var/important_information //Big red text. Should only be used if not following it would incur a bwoink.
|
var/important_information //Big red text. Should only be used if not following it would incur a bwoink.
|
||||||
var/list/origin_traits = list()
|
var/list/origin_traits = list()
|
||||||
/// Format for the following list: "Characters from this origin: [list entry], [list entry]."
|
/// Format for the following list: "Characters from this origin: [list entry], [list entry]."
|
||||||
@@ -9,12 +9,10 @@
|
|||||||
|
|
||||||
/singleton/origin_item/culture
|
/singleton/origin_item/culture
|
||||||
name = "generic culture"
|
name = "generic culture"
|
||||||
desc = "You shouldn't be seeing this."
|
|
||||||
var/list/singleton/origin_item/origin/possible_origins = list()
|
var/list/singleton/origin_item/origin/possible_origins = list()
|
||||||
|
|
||||||
/singleton/origin_item/origin
|
/singleton/origin_item/origin
|
||||||
name = "generic origin"
|
name = "generic origin"
|
||||||
desc = "You shouldn't be seeing this."
|
|
||||||
var/list/datum/accent/possible_accents = list()
|
var/list/datum/accent/possible_accents = list()
|
||||||
var/list/datum/citizenship/possible_citizenships = list()
|
var/list/datum/citizenship/possible_citizenships = list()
|
||||||
var/list/datum/religion/possible_religions = list()
|
var/list/datum/religion/possible_religions = list()
|
||||||
|
|||||||
@@ -94,6 +94,7 @@
|
|||||||
|
|
||||||
/datum/gear/accessory/neck_accessories_colourable
|
/datum/gear/accessory/neck_accessories_colourable
|
||||||
display_name = "neck accessories selection (colourable)"
|
display_name = "neck accessories selection (colourable)"
|
||||||
|
description = "A selection of various neck accessories, such as ribbons and bows."
|
||||||
path = /obj/item/clothing/accessory/tie/ribbon
|
path = /obj/item/clothing/accessory/tie/ribbon
|
||||||
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
// Root type for cooking machines. See following files for specific implementations.
|
// Root type for cooking machines. See following files for specific implementations.
|
||||||
/obj/machinery/appliance
|
/obj/machinery/appliance
|
||||||
name = "cooker"
|
name = "cooker"
|
||||||
desc = "You shouldn't be seeing this!"
|
desc = DESC_PARENT
|
||||||
desc_info = "Control-click this to change its temperature."
|
desc_info = "Control-click this to change its temperature."
|
||||||
icon = 'icons/obj/cooking_machines.dmi'
|
icon = 'icons/obj/cooking_machines.dmi'
|
||||||
var/appliancetype = 0
|
var/appliancetype = 0
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
/obj/item/mecha_equipment/mounted_system/combat
|
/obj/item/mecha_equipment/mounted_system/combat
|
||||||
name = "combat thing"
|
name = "combat thing"
|
||||||
desc = "You shouldn't be seeing this."
|
desc = DESC_PARENT
|
||||||
icon_state = "mecha_taser"
|
icon_state = "mecha_taser"
|
||||||
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
|
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
|
||||||
restricted_software = list(MECH_SOFTWARE_WEAPONS)
|
restricted_software = list(MECH_SOFTWARE_WEAPONS)
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ var/list/holder_mob_icon_cache = list()
|
|||||||
//Helper object for picking dionaea (and other creatures) up.
|
//Helper object for picking dionaea (and other creatures) up.
|
||||||
/obj/item/holder
|
/obj/item/holder
|
||||||
name = "holder"
|
name = "holder"
|
||||||
desc = "You shouldn't ever see this."
|
desc = DESC_PARENT
|
||||||
icon = 'icons/mob/npc/held_mobs.dmi'
|
icon = 'icons/mob/npc/held_mobs.dmi'
|
||||||
randpixel = 0
|
randpixel = 0
|
||||||
center_of_mass = null
|
center_of_mass = null
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
/obj/item/modular_computer
|
/obj/item/modular_computer
|
||||||
name = "Modular Computer"
|
name = "Modular Computer"
|
||||||
desc = "A modular computer. You shouldn't see this."
|
desc = DESC_PARENT
|
||||||
|
|
||||||
var/lexical_name = "computer"
|
var/lexical_name = "computer"
|
||||||
var/enabled = FALSE // Whether the computer is turned on.
|
var/enabled = FALSE // Whether the computer is turned on.
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
// Holder object used for dimming openspaces & copying lighting of below turf.
|
// Holder object used for dimming openspaces & copying lighting of below turf.
|
||||||
/atom/movable/openspace/multiplier
|
/atom/movable/openspace/multiplier
|
||||||
name = "openspace multiplier"
|
name = "openspace multiplier"
|
||||||
desc = "You shouldn't see this."
|
desc = DESC_PARENT
|
||||||
icon = 'icons/effects/lighting_overlay.dmi'
|
icon = 'icons/effects/lighting_overlay.dmi'
|
||||||
icon_state = "dark"
|
icon_state = "dark"
|
||||||
plane = OPENTURF_MAX_PLANE
|
plane = OPENTURF_MAX_PLANE
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/obj/machinery/ship_weapon
|
/obj/machinery/ship_weapon
|
||||||
name = "ship weapon"
|
name = "ship weapon"
|
||||||
desc = "You shouldn't be seeing this."
|
desc = DESC_PARENT
|
||||||
icon = 'icons/obj/machinery/ship_guns/longbow.dmi'
|
icon = 'icons/obj/machinery/ship_guns/longbow.dmi'
|
||||||
idle_power_usage = 1500
|
idle_power_usage = 1500
|
||||||
active_power_usage = 50000
|
active_power_usage = 50000
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/obj/item/gun/projectile/shotgun
|
/obj/item/gun/projectile/shotgun
|
||||||
name = "strange shotgun"
|
name = "strange shotgun"
|
||||||
desc = "A strange shotgun that doesn't seem to belong anywhere. You feel like you shouldn't be able to see this and should... submit an issue?"
|
desc = DESC_PARENT
|
||||||
var/can_sawoff = FALSE
|
var/can_sawoff = FALSE
|
||||||
var/sawnoff_workmsg
|
var/sawnoff_workmsg
|
||||||
var/sawing_in_progress = FALSE
|
var/sawing_in_progress = FALSE
|
||||||
|
|||||||
@@ -117,7 +117,7 @@
|
|||||||
|
|
||||||
/singleton/reagent/alcohol //Parent class for all alcoholic reagents, though this one shouldn't be used anywhere.
|
/singleton/reagent/alcohol //Parent class for all alcoholic reagents, though this one shouldn't be used anywhere.
|
||||||
name = null // This null name should prevent alcohol from being added to global lists.
|
name = null // This null name should prevent alcohol from being added to global lists.
|
||||||
description = "An abstract type you shouldn't be able to see."
|
description = DESC_PARENT
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
color = "#404030"
|
color = "#404030"
|
||||||
ingest_met = REM * 5
|
ingest_met = REM * 5
|
||||||
|
|||||||
@@ -182,7 +182,7 @@
|
|||||||
|
|
||||||
/obj/effect/landmark/engine_setup
|
/obj/effect/landmark/engine_setup
|
||||||
name = "Engine Setup Marker"
|
name = "Engine Setup Marker"
|
||||||
desc = "You shouldn't see this."
|
desc = DESC_PARENT
|
||||||
invisibility = 101
|
invisibility = 101
|
||||||
anchored = 1
|
anchored = 1
|
||||||
density = 0
|
density = 0
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
/obj/effect/gas_overlay
|
/obj/effect/gas_overlay
|
||||||
name = "gas"
|
name = "gas"
|
||||||
desc = "You shouldn't be clicking this."
|
desc = DESC_PARENT
|
||||||
icon = 'icons/effects/tile_effects.dmi'
|
icon = 'icons/effects/tile_effects.dmi'
|
||||||
icon_state = "generic"
|
icon_state = "generic"
|
||||||
layer = LIGHTING_LAYER - 1
|
layer = LIGHTING_LAYER - 1
|
||||||
|
|||||||
6
html/changelogs/neck_acc_fix.yml
Normal file
6
html/changelogs/neck_acc_fix.yml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
author: SleepyGemmy
|
||||||
|
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
changes:
|
||||||
|
- bugfix: "Adds missing description for the \"neck accessories selection (colourable)\" entry in the loadout."
|
||||||
Reference in New Issue
Block a user