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

Moves the can_leave_fibers var to /obj/item/clothing instead of being on /atom #23005

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Moves the can_leave_fibers var to /obj/item/clothing instead of being on /atom #23005

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba89c5f
Ezpz
DGamerL Oct 23, 2023
c1ab013
GDN review
DGamerL Oct 23, 2023
3872cfb
Belts aren't clothing
DGamerL Oct 23, 2023
c3feb04
Update code/modules/clothing/clothing.dm
DGamerL Oct 25, 2023
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
3 changes: 0 additions & 3 deletions code/game/atoms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
//Detective Work, used for the duplicate data points kept in the scanners
var/list/original_atom

//Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
S34NW marked this conversation as resolved.
Show resolved Hide resolved
var/can_leave_fibers = TRUE

var/admin_spawned = FALSE //was this spawned by an admin? used for stat tracking stuff.

var/initialized = FALSE
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
var/blockTracking
w_class = WEIGHT_CLASS_SMALL

//Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
DGamerL marked this conversation as resolved.
Show resolved Hide resolved
var/can_leave_fibers = TRUE

/obj/item/clothing/update_icon_state()
if(!can_toggle)
return
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/human_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

//Equipment slots
var/obj/item/clothing/under/w_uniform = null
var/obj/item/shoes = null
var/obj/item/clothing/shoes = null
var/obj/item/belt = null
var/obj/item/gloves = null
var/obj/item/glasses = null
var/obj/item/clothing/gloves = null
var/obj/item/clothing/glasses = null
var/obj/item/l_ear = null
var/obj/item/r_ear = null
var/obj/item/wear_id = null
Expand Down