Merge branch 'dev' of github.com:NebulaSS13/Nebula into devupdate

NebulaSS13 · Feb 1, 2025 · 9fb8057 · 9fb8057
2 parents fd44ffc + 0c5d0a0
commit 9fb8057
Show file tree

Hide file tree

Showing 113 changed files with 1,217 additions and 1,223 deletions.
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -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.

diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
@@ -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)

diff --git a/...cts/items/weapons/circuitboards/broken.dm → ...ame/objects/items/circuitboards/broken.dm b/...cts/items/weapons/circuitboards/broken.dm → ...ame/objects/items/circuitboards/broken.dm
diff --git a/...ems/weapons/circuitboards/circuitboard.dm → ...jects/items/circuitboards/circuitboard.dm b/...ems/weapons/circuitboards/circuitboard.dm → ...jects/items/circuitboards/circuitboard.dm
diff --git a/.../circuitboards/computer/air_management.dm → .../circuitboards/computer/air_management.dm b/.../circuitboards/computer/air_management.dm → .../circuitboards/computer/air_management.dm
diff --git a/...eapons/circuitboards/computer/computer.dm → .../items/circuitboards/computer/computer.dm b/...eapons/circuitboards/computer/computer.dm → .../items/circuitboards/computer/computer.dm
diff --git a/...circuitboards/computer/holodeckcontrol.dm → ...circuitboards/computer/holodeckcontrol.dm b/...circuitboards/computer/holodeckcontrol.dm → ...circuitboards/computer/holodeckcontrol.dm
diff --git a/...weapons/circuitboards/computer/modular.dm → ...s/items/circuitboards/computer/modular.dm b/...weapons/circuitboards/computer/modular.dm → ...s/items/circuitboards/computer/modular.dm
diff --git a/...weapons/circuitboards/computer/shuttle.dm → ...s/items/circuitboards/computer/shuttle.dm b/...weapons/circuitboards/computer/shuttle.dm → ...s/items/circuitboards/computer/shuttle.dm
diff --git a/...s/circuitboards/computer/station_alert.dm → ...s/circuitboards/computer/station_alert.dm b/...s/circuitboards/computer/station_alert.dm → ...s/circuitboards/computer/station_alert.dm
diff --git a/...s/circuitboards/machinery/biogenerator.dm → ...s/circuitboards/machinery/biogenerator.dm b/...s/circuitboards/machinery/biogenerator.dm → ...s/circuitboards/machinery/biogenerator.dm
diff --git a/...pons/circuitboards/machinery/chemistry.dm → ...tems/circuitboards/machinery/chemistry.dm b/...pons/circuitboards/machinery/chemistry.dm → ...tems/circuitboards/machinery/chemistry.dm
diff --git a/...eapons/circuitboards/machinery/cloning.dm → .../items/circuitboards/machinery/cloning.dm b/...eapons/circuitboards/machinery/cloning.dm → .../items/circuitboards/machinery/cloning.dm
diff --git a/...s/circuitboards/machinery/commsantenna.dm → ...s/circuitboards/machinery/commsantenna.dm b/...s/circuitboards/machinery/commsantenna.dm → ...s/circuitboards/machinery/commsantenna.dm
diff --git a/...circuitboards/machinery/docking_beacon.dm → ...circuitboards/machinery/docking_beacon.dm b/...circuitboards/machinery/docking_beacon.dm → ...circuitboards/machinery/docking_beacon.dm
diff --git a/...tboards/machinery/engineering_circuits.dm → ...tboards/machinery/engineering_circuits.dm b/...tboards/machinery/engineering_circuits.dm → ...tboards/machinery/engineering_circuits.dm
diff --git a/...apons/circuitboards/machinery/forensic.dm → ...items/circuitboards/machinery/forensic.dm b/...apons/circuitboards/machinery/forensic.dm → ...items/circuitboards/machinery/forensic.dm
diff --git a/...eapons/circuitboards/machinery/holomap.dm → .../items/circuitboards/machinery/holomap.dm b/...eapons/circuitboards/machinery/holomap.dm → .../items/circuitboards/machinery/holomap.dm
diff --git a/...pons/circuitboards/machinery/household.dm → ...tems/circuitboards/machinery/household.dm b/...pons/circuitboards/machinery/household.dm → ...tems/circuitboards/machinery/household.dm
diff --git a/...circuitboards/machinery/mech_recharger.dm → ...circuitboards/machinery/mech_recharger.dm b/...circuitboards/machinery/mech_recharger.dm → ...circuitboards/machinery/mech_recharger.dm
diff --git a/...eapons/circuitboards/machinery/medical.dm → .../items/circuitboards/machinery/medical.dm b/...eapons/circuitboards/machinery/medical.dm → .../items/circuitboards/machinery/medical.dm
diff --git a/...weapons/circuitboards/machinery/mining.dm → ...s/items/circuitboards/machinery/mining.dm b/...weapons/circuitboards/machinery/mining.dm → ...s/items/circuitboards/machinery/mining.dm
diff --git a/...s/circuitboards/machinery/mining_drill.dm → ...s/circuitboards/machinery/mining_drill.dm b/...s/circuitboards/machinery/mining_drill.dm → ...s/circuitboards/machinery/mining_drill.dm
diff --git a/...eapons/circuitboards/machinery/network.dm → .../items/circuitboards/machinery/network.dm b/...eapons/circuitboards/machinery/network.dm → .../items/circuitboards/machinery/network.dm
diff --git a/...circuitboards/machinery/oxyregenerator.dm → ...circuitboards/machinery/oxyregenerator.dm b/...circuitboards/machinery/oxyregenerator.dm → ...circuitboards/machinery/oxyregenerator.dm
diff --git a/...weapons/circuitboards/machinery/pacman.dm → ...s/items/circuitboards/machinery/pacman.dm b/...weapons/circuitboards/machinery/pacman.dm → ...s/items/circuitboards/machinery/pacman.dm
diff --git a/...boards/machinery/portable_atmospherics.dm → ...boards/machinery/portable_atmospherics.dm b/...boards/machinery/portable_atmospherics.dm → ...boards/machinery/portable_atmospherics.dm
diff --git a/.../weapons/circuitboards/machinery/power.dm → ...ts/items/circuitboards/machinery/power.dm b/.../weapons/circuitboards/machinery/power.dm → ...ts/items/circuitboards/machinery/power.dm
diff --git a/...rcuitboards/machinery/recharge_station.dm → ...rcuitboards/machinery/recharge_station.dm b/...rcuitboards/machinery/recharge_station.dm → ...rcuitboards/machinery/recharge_station.dm
diff --git a/...apons/circuitboards/machinery/research.dm → ...items/circuitboards/machinery/research.dm b/...apons/circuitboards/machinery/research.dm → ...items/circuitboards/machinery/research.dm
diff --git a/...boards/machinery/self_destruct_storage.dm → ...boards/machinery/self_destruct_storage.dm b/...boards/machinery/self_destruct_storage.dm → ...boards/machinery/self_destruct_storage.dm
diff --git a/...pons/circuitboards/machinery/shieldgen.dm → ...tems/circuitboards/machinery/shieldgen.dm b/...pons/circuitboards/machinery/shieldgen.dm → ...tems/circuitboards/machinery/shieldgen.dm
diff --git a/...ns/circuitboards/machinery/shipsensors.dm → ...ms/circuitboards/machinery/shipsensors.dm b/...ns/circuitboards/machinery/shipsensors.dm → ...ms/circuitboards/machinery/shipsensors.dm
diff --git a/...pons/circuitboards/machinery/telecomms.dm → ...tems/circuitboards/machinery/telecomms.dm b/...pons/circuitboards/machinery/telecomms.dm → ...tems/circuitboards/machinery/telecomms.dm
diff --git a/...ns/circuitboards/machinery/unary_atmos.dm → ...ms/circuitboards/machinery/unary_atmos.dm b/...ns/circuitboards/machinery/unary_atmos.dm → ...ms/circuitboards/machinery/unary_atmos.dm
diff --git a/...ects/items/weapons/circuitboards/other.dm → ...game/objects/items/circuitboards/other.dm b/...ects/items/weapons/circuitboards/other.dm → ...game/objects/items/circuitboards/other.dm
diff --git a/...jects/items/weapons/circuitboards/wall.dm → .../game/objects/items/circuitboards/wall.dm b/...jects/items/weapons/circuitboards/wall.dm → .../game/objects/items/circuitboards/wall.dm
diff --git a/code/game/objects/items/devices/whistle.dm → code/game/objects/items/devices/hailer.dm b/code/game/objects/items/devices/whistle.dm → code/game/objects/items/devices/hailer.dm
diff --git a/...tures/stool_bed_chair_nest_sofa/stools.dm → code/game/objects/items/stools.dm b/...tures/stool_bed_chair_nest_sofa/stools.dm → code/game/objects/items/stools.dm
diff --git a/...me/objects/items/weapons/tools/crowbar.dm → code/game/objects/items/tools/crowbar.dm b/...me/objects/items/weapons/tools/crowbar.dm → code/game/objects/items/tools/crowbar.dm
diff --git a/...bjects/items/weapons/tools/screwdriver.dm → code/game/objects/items/tools/screwdriver.dm b/...bjects/items/weapons/tools/screwdriver.dm → code/game/objects/items/tools/screwdriver.dm
diff --git a/...ame/objects/items/weapons/tools/shears.dm → code/game/objects/items/tools/shears.dm b/...ame/objects/items/weapons/tools/shears.dm → code/game/objects/items/tools/shears.dm
diff --git a/...objects/items/weapons/tools/wirecutter.dm → code/game/objects/items/tools/wirecutter.dm b/...objects/items/weapons/tools/wirecutter.dm → code/game/objects/items/tools/wirecutter.dm
diff --git a/...ame/objects/items/weapons/tools/wrench.dm → code/game/objects/items/tools/wrench.dm b/...ame/objects/items/weapons/tools/wrench.dm → code/game/objects/items/tools/wrench.dm
diff --git a/...me/objects/items/weapons/teleportation.dm → code/game/objects/items/weapons/locator.dm b/...me/objects/items/weapons/teleportation.dm → code/game/objects/items/weapons/locator.dm
@@ -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