Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize files into module and feature-level folders #4826

Merged
merged 13 commits into from
Feb 1, 2025
Merged

Reorganize files into module and feature-level folders #4826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a860e61
Move scent extension and decls into a module
out-of-phaze Jan 30, 2025
1e54f10
Rename whistle.dm to hailer.dm
out-of-phaze Jan 30, 2025
9fb7f55
Move scanners into modules
out-of-phaze Jan 30, 2025
64edbb5
Move implants into modules folder
out-of-phaze Jan 30, 2025
ad76a83
Move projectile effects into projectiles module
out-of-phaze Jan 30, 2025
778ceda
Move posters into modules folder
out-of-phaze Jan 30, 2025
0f76106
Move filter stand into chemistry structure folder
out-of-phaze Jan 30, 2025
70bf242
Break up the stool_bed_chair_nest_sofa folder
out-of-phaze Jan 30, 2025
524a137
Move tools out of items\weapons folder
out-of-phaze Jan 30, 2025
bd22d09
Move circuitboards out of weapons folder
out-of-phaze Jan 30, 2025
61253f6
Move welding content into one folder
out-of-phaze Jan 30, 2025
a09b11a
Rename teleportation.dm to locator.dm
out-of-phaze Jan 30, 2025
030c5b6
Move barricade tape into modules
out-of-phaze Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/Cleanable/humans.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
persistent = TRUE
appearance_flags = NO_CLIENT_COLOR
cleanable_scent = "blood"
scent_descriptor = SCENT_DESC_ODOR
scent_descriptor = "odour"

var/base_icon = 'icons/effects/blood.dmi'
var/basecolor=COLOR_BLOOD_HUMAN // Color when wet.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var/cleanable_scent
var/scent_type = /datum/extension/scent/custom
var/scent_intensity = /decl/scent_intensity/normal
var/scent_descriptor = SCENT_DESC_SMELL
var/scent_descriptor = "smell"
var/scent_range = 2

/obj/effect/decal/cleanable/Initialize(var/ml, var/_age)
Expand Down
0 ...cts/items/weapons/circuitboards/broken.dm → ...ame/objects/items/circuitboards/broken.dm
View file
Open in desktop
File renamed without changes.
0 ...ems/weapons/circuitboards/circuitboard.dm → ...jects/items/circuitboards/circuitboard.dm
View file
Open in desktop
File renamed without changes.
0 .../circuitboards/computer/air_management.dm → .../circuitboards/computer/air_management.dm
View file
Open in desktop
File renamed without changes.
0 ...eapons/circuitboards/computer/computer.dm → .../items/circuitboards/computer/computer.dm
View file
Open in desktop
File renamed without changes.
0 ...circuitboards/computer/holodeckcontrol.dm → ...circuitboards/computer/holodeckcontrol.dm
View file
Open in desktop
File renamed without changes.
0 ...weapons/circuitboards/computer/modular.dm → ...s/items/circuitboards/computer/modular.dm
View file
Open in desktop
File renamed without changes.
0 ...weapons/circuitboards/computer/shuttle.dm → ...s/items/circuitboards/computer/shuttle.dm
View file
Open in desktop
File renamed without changes.
0 ...s/circuitboards/computer/station_alert.dm → ...s/circuitboards/computer/station_alert.dm
View file
Open in desktop
File renamed without changes.
0 ...s/circuitboards/machinery/biogenerator.dm → ...s/circuitboards/machinery/biogenerator.dm
View file
Open in desktop
File renamed without changes.
0 ...pons/circuitboards/machinery/chemistry.dm → ...tems/circuitboards/machinery/chemistry.dm
View file
Open in desktop
File renamed without changes.
0 ...eapons/circuitboards/machinery/cloning.dm → .../items/circuitboards/machinery/cloning.dm
View file
Open in desktop
File renamed without changes.
0 ...s/circuitboards/machinery/commsantenna.dm → ...s/circuitboards/machinery/commsantenna.dm
View file
Open in desktop
File renamed without changes.
0 ...circuitboards/machinery/docking_beacon.dm → ...circuitboards/machinery/docking_beacon.dm
View file
Open in desktop
File renamed without changes.
0 ...tboards/machinery/engineering_circuits.dm → ...tboards/machinery/engineering_circuits.dm
View file
Open in desktop
File renamed without changes.
0 ...apons/circuitboards/machinery/forensic.dm → ...items/circuitboards/machinery/forensic.dm
View file
Open in desktop
File renamed without changes.
0 ...eapons/circuitboards/machinery/holomap.dm → .../items/circuitboards/machinery/holomap.dm
View file
Open in desktop
File renamed without changes.
0 ...pons/circuitboards/machinery/household.dm → ...tems/circuitboards/machinery/household.dm
View file
Open in desktop
File renamed without changes.
0 ...circuitboards/machinery/mech_recharger.dm → ...circuitboards/machinery/mech_recharger.dm
View file
Open in desktop
File renamed without changes.
0 ...eapons/circuitboards/machinery/medical.dm → .../items/circuitboards/machinery/medical.dm
View file
Open in desktop
File renamed without changes.
0 ...weapons/circuitboards/machinery/mining.dm → ...s/items/circuitboards/machinery/mining.dm
View file
Open in desktop
File renamed without changes.
0 ...s/circuitboards/machinery/mining_drill.dm → ...s/circuitboards/machinery/mining_drill.dm
View file
Open in desktop
File renamed without changes.
0 ...eapons/circuitboards/machinery/network.dm → .../items/circuitboards/machinery/network.dm
View file
Open in desktop
File renamed without changes.
0 ...circuitboards/machinery/oxyregenerator.dm → ...circuitboards/machinery/oxyregenerator.dm
View file
Open in desktop
File renamed without changes.
0 ...weapons/circuitboards/machinery/pacman.dm → ...s/items/circuitboards/machinery/pacman.dm
View file
Open in desktop
File renamed without changes.
0 ...boards/machinery/portable_atmospherics.dm → ...boards/machinery/portable_atmospherics.dm
View file
Open in desktop
File renamed without changes.
0 .../weapons/circuitboards/machinery/power.dm → ...ts/items/circuitboards/machinery/power.dm
View file
Open in desktop
File renamed without changes.
0 ...rcuitboards/machinery/recharge_station.dm → ...rcuitboards/machinery/recharge_station.dm
View file
Open in desktop
File renamed without changes.
0 ...apons/circuitboards/machinery/research.dm → ...items/circuitboards/machinery/research.dm
View file
Open in desktop
File renamed without changes.
0 ...boards/machinery/self_destruct_storage.dm → ...boards/machinery/self_destruct_storage.dm
View file
Open in desktop
File renamed without changes.
0 ...pons/circuitboards/machinery/shieldgen.dm → ...tems/circuitboards/machinery/shieldgen.dm
View file
Open in desktop
File renamed without changes.
0 ...ns/circuitboards/machinery/shipsensors.dm → ...ms/circuitboards/machinery/shipsensors.dm
View file
Open in desktop
File renamed without changes.
0 ...pons/circuitboards/machinery/telecomms.dm → ...tems/circuitboards/machinery/telecomms.dm
View file
Open in desktop
File renamed without changes.
0 ...ns/circuitboards/machinery/unary_atmos.dm → ...ms/circuitboards/machinery/unary_atmos.dm
View file
Open in desktop
File renamed without changes.
0 ...ects/items/weapons/circuitboards/other.dm → ...game/objects/items/circuitboards/other.dm
View file
Open in desktop
File renamed without changes.
0 ...jects/items/weapons/circuitboards/wall.dm → .../game/objects/items/circuitboards/wall.dm
View file
Open in desktop
File renamed without changes.
0 code/game/objects/items/devices/whistle.dm → code/game/objects/items/devices/hailer.dm
View file
Open in desktop
File renamed without changes.
0 ...tures/stool_bed_chair_nest_sofa/stools.dm → code/game/objects/items/stools.dm
View file
Open in desktop
File renamed without changes.
0 ...me/objects/items/weapons/tools/crowbar.dm → code/game/objects/items/tools/crowbar.dm
View file
Open in desktop
File renamed without changes.
0 ...bjects/items/weapons/tools/screwdriver.dm → code/game/objects/items/tools/screwdriver.dm
View file
Open in desktop
File renamed without changes.
0 ...ame/objects/items/weapons/tools/shears.dm → code/game/objects/items/tools/shears.dm
View file
Open in desktop
File renamed without changes.
0 ...objects/items/weapons/tools/wirecutter.dm → code/game/objects/items/tools/wirecutter.dm
View file
Open in desktop
File renamed without changes.
0 ...ame/objects/items/weapons/tools/wrench.dm → code/game/objects/items/tools/wrench.dm
View file
Open in desktop
File renamed without changes.
8 changes: 1 addition & 7 deletions ...me/objects/items/weapons/teleportation.dm → code/game/objects/items/weapons/locator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
/* Teleportation devices.
* Contains:
* Locator
* Hand-tele
*/

/*
* Locator
*/
/obj/item/locator
name = "locator"
desc = "Used to track those with locater implants."
desc = "Used to track those with locator implants."
icon = 'icons/obj/items/device/locator.dmi'
icon_state = ICON_STATE_WORLD
var/temp = null
Expand Down
Loading
Loading