Skip to content

Commit 9fb8057

Browse files
MistakeNot4892MistakeNot4892
committed
Merge branch 'dev' of github.com:NebulaSS13/Nebula into devupdate
2 parents fd44ffc + 0c5d0a0 commit 9fb8057

File tree

113 files changed

+1217
-1223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1217
-1223
lines changed

‎code/game/objects/effects/decals/Cleanable/humans.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
persistent = TRUE
1616
appearance_flags = NO_CLIENT_COLOR
1717
cleanable_scent = "blood"
18-
scent_descriptor = SCENT_DESC_ODOR
18+
scent_descriptor = "odour"
1919

2020
var/base_icon = 'icons/effects/blood.dmi'
2121
var/basecolor=COLOR_BLOOD_HUMAN // Color when wet.

‎code/game/objects/effects/decals/cleanable.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
var/cleanable_scent
1515
var/scent_type = /datum/extension/scent/custom
1616
var/scent_intensity = /decl/scent_intensity/normal
17-
var/scent_descriptor = SCENT_DESC_SMELL
17+
var/scent_descriptor = "smell"
1818
var/scent_range = 2
1919

2020
/obj/effect/decal/cleanable/Initialize(var/ml, var/_age)

code/game/objects/items/weapons/circuitboards/broken.dm renamed to code/game/objects/items/circuitboards/broken.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/circuitboard.dm renamed to code/game/objects/items/circuitboards/circuitboard.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/air_management.dm renamed to code/game/objects/items/circuitboards/computer/air_management.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/computer.dm renamed to code/game/objects/items/circuitboards/computer/computer.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/holodeckcontrol.dm renamed to code/game/objects/items/circuitboards/computer/holodeckcontrol.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/modular.dm renamed to code/game/objects/items/circuitboards/computer/modular.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/shuttle.dm renamed to code/game/objects/items/circuitboards/computer/shuttle.dm

File renamed without changes.

code/game/objects/items/weapons/circuitboards/computer/station_alert.dm renamed to code/game/objects/items/circuitboards/computer/station_alert.dm

File renamed without changes.

0 commit comments

Comments
 (0)