cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-15 01:46:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentations (#17481)

Browse Source 
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
This commit is contained in:
Fluffy
2023-10-05 12:15:58 +02:00
committed by GitHub
parent 032853824d
commit 4538e2a7cc
471 changed files with 2670 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/_component.dm
+141 -141
View File
@@ -1,40 +1,40 @@
/**
* # Component
*
* The component datum
*
* A component should be a single standalone unit
* of functionality, that works by receiving signals from it's parent
* object to provide some single functionality (i.e a slippery component)
* that makes the object it's attached to cause people to slip over.
* Useful when you want shared behaviour independent of type inheritance
*/
* # Component
*
* The component datum
*
* A component should be a single standalone unit
* of functionality, that works by receiving signals from it's parent
* object to provide some single functionality (i.e a slippery component)
* that makes the object it's attached to cause people to slip over.
* Useful when you want shared behaviour independent of type inheritance
*/
/datum/component
/// Defines how duplicate existing components are handled when added to a datum
/// See `COMPONENT_DUPE_*` definitions for available options
var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
/// The type to check for duplication
/// `null` means exact match on `type` (default)
/// Any other type means that and all subtypes
var/dupe_type
/// The datum this components belongs to
var/datum/parent
/// Only set to true if you are able to properly transfer this component
/// At a minimum RegisterWithParent and UnregisterFromParent should be used
/// Make sure you also implement PostTransfer for any post transfer handling
var/can_transfer = FALSE
/**
* Create a new component.
*
* Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize]
*
* Arguments:
* * datum/P the parent datum this component reacts to signals from
*/
* Create a new component.
*
* Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize]
*
* Arguments:
* * datum/P the parent datum this component reacts to signals from
*/
/datum/component/New(list/raw_args)
parent = raw_args[1]
var/list/arguments = raw_args.Copy(2)
@@ -46,17 +46,17 @@
_JoinParent(parent)
/**
* Called during component creation with the same arguments as in new excluding parent.
* Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead
*/
* Called during component creation with the same arguments as in new excluding parent.
* Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead
*/
/datum/component/proc/Initialize(...)
return
/**
* Properly removes the component from `parent` and cleans up references
* Setting `force` makes it not check for and remove the component from the parent
* Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
*/
* Properly removes the component from `parent` and cleans up references
* Setting `force` makes it not check for and remove the component from the parent
* Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
*/
/datum/component/Destroy(force=FALSE, silent=FALSE)
if(!force && parent)
_RemoveFromParent()
@@ -66,8 +66,8 @@
return ..()
/**
* Internal proc to handle behaviour of components when joining a parent
*/
* Internal proc to handle behaviour of components when joining a parent
*/
/datum/component/proc/_JoinParent()
var/datum/P = parent
//lazy init the parent's dc list
@@ -104,8 +104,8 @@
RegisterWithParent()
/**
* Internal proc to handle behaviour when being removed from a parent
*/
* Internal proc to handle behaviour when being removed from a parent
*/
/datum/component/proc/_RemoveFromParent()
var/datum/P = parent
var/list/dc = P.datum_components
@@ -125,37 +125,37 @@
UnregisterFromParent()
/**
* Register the component with the parent object
*
* Use this proc to register with your parent object
* Overridable proc that's called when added to a new parent
*/
* Register the component with the parent object
*
* Use this proc to register with your parent object
* Overridable proc that's called when added to a new parent
*/
/datum/component/proc/RegisterWithParent()
return
/**
* Unregister from our parent object
*
* Use this proc to unregister from your parent object
* Overridable proc that's called when removed from a parent
* *
*/
* Unregister from our parent object
*
* Use this proc to unregister from your parent object
* Overridable proc that's called when removed from a parent
*
*/
/datum/component/proc/UnregisterFromParent()
return
/**
* Register to listen for a signal from the passed in target
*
* This sets up a listening relationship such that when the target object emits a signal
* the source datum this proc is called upon, will recieve a callback to the given proctype
* Return values from procs registered must be a bitfield
*
* Arguments:
* * datum/target The target to listen for signals from
* * sig_type_or_types Either a string signal name, or a list of signal names (strings)
* * proctype The proc to call back when the signal is emitted
* * override If a previous registration exists you must explicitly set this
*/
* Register to listen for a signal from the passed in target
*
* This sets up a listening relationship such that when the target object emits a signal
* the source datum this proc is called upon, will recieve a callback to the given proctype
* Return values from procs registered must be a bitfield
*
* Arguments:
* * datum/target The target to listen for signals from
* * sig_type_or_types Either a string signal name, or a list of signal names (strings)
* * proctype The proc to call back when the signal is emitted
* * override If a previous registration exists you must explicitly set this
*/
/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proctype, override = FALSE)
if(QDELETED(src) || QDELETED(target))
return
@@ -189,15 +189,15 @@
signal_enabled = TRUE
/**
* Stop listening to a given signal from target
*
* Breaks the relationship between target and source datum, removing the callback when the signal fires
* Doesn't care if a registration exists or not
*
* Arguments:
* * datum/target Datum to stop listening to signals from
* * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically
*/
* Stop listening to a given signal from target
*
* Breaks the relationship between target and source datum, removing the callback when the signal fires
* Doesn't care if a registration exists or not
*
* Arguments:
* * datum/target Datum to stop listening to signals from
* * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically
*/
/datum/proc/UnregisterSignal(datum/target, sig_type_or_types)
var/list/lookup = target.comp_lookup
if(!signal_procs || !signal_procs[target] || !lookup)
@@ -228,47 +228,47 @@
signal_procs -= target
/**
* Called on a component when a component of the same type was added to the same parent
* See `/datum/component/var/dupe_mode`
* `C`'s type will always be the same of the called component
*/
* Called on a component when a component of the same type was added to the same parent
* See `/datum/component/var/dupe_mode`
* `C`'s type will always be the same of the called component
*/
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
return
/**
* Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE]
*
* See [/datum/component/var/dupe_mode]
*
* `C`'s type will always be the same of the called component
*
* return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component
*/
* Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE]
*
* See [/datum/component/var/dupe_mode]
*
* `C`'s type will always be the same of the called component
*
* return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component
*/
/datum/component/proc/CheckDupeComponent(datum/component/C, ...)
return
/**
* Callback Just before this component is transferred
*
* Use this to do any special cleanup you might need to do before being deregged from an object
*
*/
* Callback Just before this component is transferred
*
* Use this to do any special cleanup you might need to do before being deregged from an object
*
*/
/datum/component/proc/PreTransfer()
return
/**
* Callback Just after a component is transferred
*
* Use this to do any special setup you need to do after being moved to a new object
* Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead
*
*/
* Callback Just after a component is transferred
*
* Use this to do any special setup you need to do after being moved to a new object
* Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead
*
*/
/datum/component/proc/PostTransfer()
return COMPONENT_INCOMPATIBLE //Do not support transfer by default as you must properly support it
/**
* Internal proc to create a list of our type and all parent types
*/
* Internal proc to create a list of our type and all parent types
*/
/datum/component/proc/_GetInverseTypeList(our_type = type)
//we can do this one simple trick
var/current_type = parent_type
@@ -279,10 +279,10 @@
. += current_type
/**
* Internal proc to handle most all of the signaling procedure
* Will runtime if used on datums with an empty component list
* Use the `SEND_SIGNAL` define instead
*/
* Internal proc to handle most all of the signaling procedure
* Will runtime if used on datums with an empty component list
* Use the `SEND_SIGNAL` define instead
*/
/datum/proc/_SendSignal(sigtype, list/arguments)
var/target = comp_lookup[sigtype]
if(!length(target))
@@ -303,12 +303,12 @@
// The type arg is casted so initial works, you shouldn't be passing a real instance into this
/**
* Return any component assigned to this datum of the given type
* This will throw an error if it's possible to have more than one component of that type on the parent
*
* Arguments:
* * datum/component/c_type The typepath of the component you want to get a reference to
*/
* Return any component assigned to this datum of the given type
* This will throw an error if it's possible to have more than one component of that type on the parent
*
* Arguments:
* * datum/component/c_type The typepath of the component you want to get a reference to
*/
/datum/proc/GetComponent(datum/component/c_type)
RETURN_TYPE(c_type)
if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED)
@@ -322,12 +322,12 @@
// The type arg is casted so initial works, you shouldn't be passing a real instance into this
/**
* Return any component assigned to this datum of the exact given type
* This will throw an error if it's possible to have more than one component of that type on the parent
*
* Arguments:
* * datum/component/c_type The typepath of the component you want to get a reference to
*/
* Return any component assigned to this datum of the exact given type
* This will throw an error if it's possible to have more than one component of that type on the parent
*
* Arguments:
* * datum/component/c_type The typepath of the component you want to get a reference to
*/
/datum/proc/GetExactComponent(datum/component/c_type)
RETURN_TYPE(c_type)
if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED)
@@ -344,11 +344,11 @@
return null
/**
* Get all components of a given type that are attached to this datum
*
* Arguments:
* * c_type The component type path
*/
* Get all components of a given type that are attached to this datum
*
* Arguments:
* * c_type The component type path
*/
/datum/proc/GetComponents(c_type)
var/list/dc = datum_components
if(!dc)
@@ -358,12 +358,12 @@
return list(.)
/**
* Creates an instance of `new_type` in the datum and attaches to it as parent
* Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
* Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
* If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it
* Properly handles duplicate situations based on the `dupe_mode` var
*/
* Creates an instance of `new_type` in the datum and attaches to it as parent
* Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
* Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
* If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it
* Properly handles duplicate situations based on the `dupe_mode` var
*/
/datum/proc/_AddComponent(list/raw_args)
var/new_type = raw_args[1]
var/datum/component/nt = new_type
@@ -431,22 +431,22 @@
return old_comp
/**
* Get existing component of type, or create it and return a reference to it
*
* Use this if the item needs to exist at the time of this call, but may not have been created before now
*
* Arguments:
* * component_type The typepath of the component to create or return
* * ... additional arguments to be passed when creating the component if it does not exist
*/
* Get existing component of type, or create it and return a reference to it
*
* Use this if the item needs to exist at the time of this call, but may not have been created before now
*
* Arguments:
* * component_type The typepath of the component to create or return
* * ... additional arguments to be passed when creating the component if it does not exist
*/
/datum/proc/LoadComponent(component_type, ...)
. = GetComponent(component_type)
if(!.)
return _AddComponent(args)
/**
* Removes the component from parent, ends up with a null parent
*/
* Removes the component from parent, ends up with a null parent
*/
/datum/component/proc/RemoveComponent()
if(!parent)
return
@@ -457,13 +457,13 @@
SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src)
/**
* Transfer this component to another parent
*
* Component is taken from source datum
*
* Arguments:
* * datum/component/target Target datum to transfer to
*/
* Transfer this component to another parent
*
* Component is taken from source datum
*
* Arguments:
* * datum/component/target Target datum to transfer to
*/
/datum/proc/TakeComponent(datum/component/target)
if(!target || target.parent == src)
return
@@ -481,13 +481,13 @@
target._JoinParent()
/**
* Transfer all components to target
*
* All components from source datum are taken
*
* Arguments:
* * /datum/target the target to move the components to
*/
* Transfer all components to target
*
* All components from source datum are taken
*
* Arguments:
* * /datum/target the target to move the components to
*/
/datum/proc/TransferComponents(datum/target)
var/list/dc = datum_components
if(!dc)
@@ -503,7 +503,7 @@
target.TakeComponent(comps)
/**
* Return the object that is the host of any UI's that this component has
*/
* Return the object that is the host of any UI's that this component has
*/
/datum/component/ui_host()
return parent
code/datums/components/armor/armor.dm
+1 -1
View File
@@ -116,4 +116,4 @@
active = new_state
/datum/component/armor/toggle/get_value(key)
return active ? ..() : 0
return active ? ..() : 0
code/datums/components/turf_click/turf_hand.dm
+1 -1
View File
@@ -16,4 +16,4 @@
src.priority = priority
/datum/component/turf_hand/proc/OnHandInterception(var/mob/user)
return our_owner.attack_hand(user)
return our_owner.attack_hand(user)
code/datums/elements/_element.dm
+14 -14
View File
@@ -1,19 +1,19 @@
/**
* A holder for simple behaviour that can be attached to many different types
*
* Only one element of each type is instanced during game init.
* Otherwise acts basically like a lightweight component.
*/
* A holder for simple behaviour that can be attached to many different types
*
* Only one element of each type is instanced during game init.
* Otherwise acts basically like a lightweight component.
*/
/datum/element
/// Option flags for element behaviour
var/element_flags = NONE
/**
* The index of the first attach argument to consider for duplicate elements
*
* Is only used when flags contains [ELEMENT_BESPOKE]
*
* This is infinity so you must explicitly set this
*/
* The index of the first attach argument to consider for duplicate elements
*
* Is only used when flags contains [ELEMENT_BESPOKE]
*
* This is infinity so you must explicitly set this
*/
var/id_arg_index = INFINITY
/// Activates the functionality defined by the element on the given target datum
@@ -47,9 +47,9 @@
CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]")
/**
* Finds the singleton for the element type given and detaches it from src
* You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE]
*/
* Finds the singleton for the element type given and detaches it from src
* You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE]
*/
/datum/proc/_RemoveElement(list/arguments)
var/datum/element/ele = SSdcs.GetElement(arguments)
ele.Detach(src)
code/datums/ert/outsider.dm
+1 -1
View File
@@ -46,4 +46,4 @@
name = "Elyran Navy"
chance = 15
spawner = /datum/ghostspawner/human/ert/elyra
possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ)
possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ)
code/datums/ert/tcfl.dm
+1 -1
View File
@@ -2,4 +2,4 @@
name = "Tau Ceti Foreign Legion"
chance = 20
spawner = /datum/ghostspawner/human/ert/tcfl
possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)
possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE)
code/datums/helper_datums/getrev.dm
+2 -2
View File
@@ -72,8 +72,8 @@ var/global/datum/getrev/revdata = new()
/datum/getrev/proc/generate_greeting_info()
if (!test_merges.len)
greeting_info = {"<div class="alert alert-info">
There are currently no test merges loaded onto the server.
</div>"}
There are currently no test merges loaded onto the server.
</div>"}
return
var/list/out = list("<p>There are currently [test_merges.len] PRs being tested live.</p>",
code/datums/looping_sounds/revenant_rift.dm
+1 -1
View File
@@ -4,4 +4,4 @@
mid_sounds = list('sound/ambience/tension/horror.ogg' = 1)
mid_length = 260
end_sound = list('sound/effects/psi/power_feedback.ogg' = 1)
volume = 80
volume = 80
code/datums/looping_sounds/thermal_drill.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/looping_sound/thermal_drill
mid_sounds = list('sound/items/thermal_drill.ogg' = 1)
mid_length = 19
volume = 30
volume = 30
code/datums/observation/_debug.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/****************
* Debug Support *
****************/
var/list/all_observable_events = list()
var/list/all_observable_events = list()
code/datums/observation/entered.dm
+1 -1
View File
@@ -21,4 +21,4 @@ var/singleton/observ/entered/entered_event = new()
/atom/Entered(atom/movable/enterer, atom/old_loc)
..()
entered_event.raise_event(src, enterer, old_loc)
entered_event.raise_event(src, enterer, old_loc)
code/datums/observation/exited.dm
+1 -1
View File
@@ -21,4 +21,4 @@ var/singleton/observ/exited/exited_event = new()
/atom/Exited(atom/movable/exitee, atom/new_loc)
. = ..()
exited_event.raise_event(src, exitee, new_loc)
exited_event.raise_event(src, exitee, new_loc)
code/datums/observation/helpers.dm
+1 -1
View File
@@ -18,4 +18,4 @@
// Sometimes you just want to end yourself
/datum/proc/qdel_self()
qdel(src)
qdel(src)
code/datums/observation/instruments.dm
+1 -1
View File
@@ -9,4 +9,4 @@ var/singleton/observ/instrument_synchronizer/instrument_synchronizer = new()
/singleton/observ/instrument_synchronizer
name = "Instrument synchronizer"
expected_type = /datum
expected_type = /datum
code/datums/observation/see_in_dark_set.dm
+1 -1
View File
@@ -22,4 +22,4 @@ var/singleton/observ/see_in_dark_set/see_in_dark_set_event = new()
var/old_see_in_dark = sight
if(old_see_in_dark != new_see_in_dark)
see_in_dark = new_see_in_dark
see_in_dark_set_event.raise_event(src, old_see_in_dark, new_see_in_dark)
see_in_dark_set_event.raise_event(src, old_see_in_dark, new_see_in_dark)
code/datums/observation/see_invisible_set.dm
+1 -1
View File
@@ -22,4 +22,4 @@ var/singleton/observ/see_invisible_set/see_invisible_set_event = new()
var/old_see_invisible = see_invisible
if(old_see_invisible != new_see_invisible)
see_invisible = new_see_invisible
see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible)
see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible)
code/datums/observation/shuttle_moved.dm
+1 -1
View File
@@ -35,4 +35,4 @@ var/singleton/observ/shuttle_pre_move/shuttle_pre_move_event = new()
*****************/
// Located in modules/shuttle/shuttle.dm
// Proc: /datum/shuttle/proc/attempt_move()
// Proc: /datum/shuttle/proc/attempt_move()
code/datums/observation/sight_set.dm
+1 -1
View File
@@ -22,4 +22,4 @@ var/singleton/observ/sight_set/sight_set_event = new()
var/old_sight = sight
if(old_sight != new_sight)
sight = new_sight
sight_set_event.raise_event(src, old_sight, new_sight)
sight_set_event.raise_event(src, old_sight, new_sight)
code/datums/outfits/ert/ap_eridani.dm
+12 -12
View File
@@ -117,12 +117,12 @@
belt_contents = list(
/obj/item/reagent_containers/hypospray/combat/empty = 1,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 1,
/obj/item/reagent_containers/glass/bottle/antitoxin = 1,
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 1,
/obj/item/reagent_containers/glass/bottle/antitoxin = 1,
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/storage/pill_bottle/mortaphenyl = 1
)
@@ -156,11 +156,11 @@
belt_contents = list(
/obj/item/reagent_containers/hypospray/combat/empty = 1,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 1,
/obj/item/reagent_containers/glass/bottle/antitoxin = 1,
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 1,
/obj/item/reagent_containers/glass/bottle/antitoxin = 1,
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/melee/baton/stunrod = 1
)
code/datums/outfits/ert/deathsquad.dm
+1 -1
View File
@@ -67,4 +67,4 @@
if(mercrig)
H.put_in_hands(mercrig)
H.equip_to_slot_or_del(mercrig, slot_back)
addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS)
addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS)
code/datums/outfits/ert/fsf.dm
+2 -2
View File
@@ -16,14 +16,14 @@
backpack_contents = list(
/obj/item/melee/energy/sword/knife/sol = 1
)
)
belt_contents = list(
/obj/item/ammo_magazine/c762/sol = 1,
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/handcuffs/ziptie = 2,
/obj/item/grenade/frag = 1
)
)
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1)
code/datums/outfits/ert/syndicate.dm
+1 -1
View File
@@ -27,4 +27,4 @@
/datum/outfit/admin/deathsquad/syndicate/leader
name = "Syndicate Commando Lead"
l_pocket = /obj/item/pinpointer
l_pocket = /obj/item/pinpointer
code/datums/repositories/sound_channels.dm
+1 -1
View File
@@ -47,4 +47,4 @@ var/repository/sound_channels/sound_channels = new()
/repository/sound_channels/proc/ReleaseChannels(list/channels)
for(var/channel in channels)
LAZYREMOVE(keys_by_channel, "[channel]")
available_channels.Push(channel)
available_channels.Push(channel)
code/datums/trading/_trading_defines.dm
+1 -1
View File
@@ -16,4 +16,4 @@
#define TRADER_NO_BLACKLISTED "trade_blacklist"
#define TRADER_FOUND_UNWANTED "trade_found_unwanted"
#define TRADER_DEFAULT_NAME "Default" //Whether to just generate a name from the premade lists.
#define TRADER_DEFAULT_NAME "Default" //Whether to just generate a name from the premade lists.
code/datums/trading/misc.dm
+1 -1
View File
@@ -355,4 +355,4 @@
/obj/item/stack/material/phoron = TRADER_THIS_TYPE
)
mob_transfer_message = "You are transported to the ORIGIN. When the transportation dizziness wears off, you find you are surrounded by Golden Deep agents..."
mob_transfer_message = "You are transported to the ORIGIN. When the transportation dizziness wears off, you find you are surrounded by Golden Deep agents..."
code/datums/trading/ship.dm
+1 -1
View File
@@ -21,4 +21,4 @@
var/length = round(amt/100)
duration_of_stay += length
. = get_response("bribe_accept", "Sure, I'll stay for TIME more minutes.")
. = replacetext(., "TIME", length)
. = replacetext(., "TIME", length)
code/datums/underwear/socks.dm
+1 -1
View File
@@ -192,4 +192,4 @@
/datum/category_item/underwear/socks/fishnet_nosock
name = "Fishnet Tights, Short"
icon_state = "fishnet_nosock"
has_color = TRUE
has_color = TRUE
code/datums/uplink/devices_and_tools.dm
+1 -1
View File
@@ -78,7 +78,7 @@
/datum/uplink_item/item/tools/personal_shield
name = "Personal Shield"
desc = "A personal shield that, when kept in your hand and activated, will protect its user from five projectile shots. \
This can only be bought once."
This can only be bought once."
telecrystal_cost = 1
item_limit = 1
path = /obj/item/device/personal_shield
code/datums/wires/disposals.dm
+1 -1
View File
@@ -34,4 +34,4 @@ var/const/DISPOSAL_WIRE_FLUSH = 1
var/obj/machinery/disposal/D = holder
if(D.mode <= 0)
return TRUE
return FALSE
return FALSE
code/datums/wires/vending.dm
+1 -1
View File
@@ -89,4 +89,4 @@ var/const/VENDING_WIRE_HEATING = 32
if(16)
return "Cooling"
if(32)
return "Heating"
return "Heating"
code/datums/wires/wires.dm
+1 -1
View File
@@ -159,7 +159,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown"
holder.add_hiddenprint(L)
else
to_chat(L, SPAN_WARNING("You need a multitool!"))
// Update Window
Interact(usr)