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

Jump to bottom

Desouls the Roboticist Jumpsuit, and adds new Roboticist Boilersuit #74352

Merged
merged 11 commits into from
Apr 10, 2023
Merged

Desouls the Roboticist Jumpsuit, and adds new Roboticist Boilersuit #74352

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2602aa9
Desouls the Roboticist Jumpsuit, and adds new boilersuit
Moth-lantern Mar 29, 2023
e712c46
Merge branch 'master' into Roboticist-desouling
Moth-lantern Mar 29, 2023
c0fbde8
Adding a space to boilerskirt code
Moth-lantern Mar 29, 2023
ad1b61d
Merge branch 'Roboticist-desouling' of https://github.com/Moth-lanter…
Moth-lantern Mar 29, 2023
b555842
Update code/modules/clothing/under/jobs/rnd.dm
Moth-lantern Apr 2, 2023
68467e7
Removing Boilersuit
Moth-lantern Apr 9, 2023
49114a9
Merge branch 'master' into Roboticist-desouling
Moth-lantern Apr 9, 2023
02b5471
whoops forgot the inhands,
Moth-lantern Apr 9, 2023
c15f0e1
Merge branch 'Roboticist-desouling' of https://github.com/Moth-lanter…
Moth-lantern Apr 9, 2023
bba10f9
Merge branch 'master' into Roboticist-desouling
Moth-lantern Apr 9, 2023
02333f7
Merge branch 'master' into Roboticist-desouling
Moth-lantern Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions code/modules/clothing/under/jobs/rnd.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,23 @@
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/rnd/roboticist/boiler
desc = "It's a comfortable black boilersuit, perfect for hiding oil stains from your RD."
name = "roboticist's boilersuit"
icon_state = "robotics_boilersuit"
inhand_icon_state = null
resistance_flags = NONE

/obj/item/clothing/under/rank/rnd/roboticist/boiler/skirt
name = "roboticist's boilerskirt"
desc = "It's a comfortable black boilersuit, perfect for hiding oil stains from your RD."
Moth-lantern marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "robotics_boilerskirt"
inhand_icon_state = null
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/rank/rnd/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
name = "geneticist's jumpsuit"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/vending/wardrobes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@
/obj/item/clothing/glasses/hud/diagnostic = 2,
/obj/item/clothing/under/rank/rnd/roboticist = 2,
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 2,
/obj/item/clothing/under/rank/rnd/roboticist/boiler = 2,
/obj/item/clothing/under/rank/rnd/roboticist/boiler/skirt = 2,
/obj/item/clothing/suit/toggle/labcoat/roboticist = 2,
/obj/item/clothing/suit/hooded/wintercoat/science/robotics = 3,
/obj/item/clothing/shoes/sneakers/black = 2,
Expand Down
Binary file modified icons/mob/clothing/under/rnd.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/under/rnd.dmi
View file
Open in desktop
Binary file not shown.