Skip to content
This repository has been archived by the owner on Jan 1, 2025. It is now read-only.

Manual Mirror #180 #3

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Manual Mirror #180 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
435ed29
colorening BEGIN
CliffracerX Sep 25, 2024
a030581
Merge branch 'master' into the-colorening
CliffracerX Oct 18, 2024
85f8860
Viro uniform tweak
CliffracerX Oct 18, 2024
499d011
Obj icons, overrides
CliffracerX Oct 18, 2024
e978ab1
Merge branch 'master' into the-colorening
CliffracerX Oct 26, 2024
bfeac44
Labcoat fixening, surgical caps, yippee!
CliffracerX Oct 26, 2024
4832dd6
Merge branch 'master' into the-colorening
CliffracerX Oct 27, 2024
408f9bd
hospital gown fixening
CliffracerX Oct 27, 2024
2a8cd88
CI Sacrifice 1, surgical cap fixening
CliffracerX Oct 27, 2024
a7ff24b
more fixening, shoes
CliffracerX Oct 27, 2024
e03e6bb
the final CI sacrifice
CliffracerX Oct 27, 2024
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
Binary file modified code/modules/unit_tests/screenshots/screenshot_antag_icons_changeling.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified code/modules/unit_tests/screenshots/screenshot_antag_icons_stowawaychangeling.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
name = "Green Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/mad

/datum/loadout_item/suit/labcoat/custom
name = "Custom Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/custom

/*
* PONCHOS
*/
Expand Down
3 changes: 3 additions & 0 deletions modular_doppler/modular_cosmetics/code/head/basehead_edits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/item/clothing/head/utility/surgerycap
icon = 'modular_doppler/modular_cosmetics/icons/obj/head/base/medical.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/base/medical.dmi'
16 changes: 16 additions & 0 deletions modular_doppler/modular_cosmetics/code/shoes/baseshoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,22 @@
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/sneakers/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/sneakers/worn/digi)

/obj/item/clothing/shoes/sneakers/doppler
name = "doppler sneakers"
greyscale_colors = "#2b2b2b#ffffff"

/obj/item/clothing/shoes/sneakers/doppler/med_green
name = "apple-green sneakers"
greyscale_colors = "#B7DE5B#ffffff"

/obj/item/clothing/shoes/sneakers/doppler/eng_orange
name = "orange sneakers"
greyscale_colors = "#FBB954#ffffff"

/obj/item/clothing/shoes/sneakers/doppler/cmd_electric
name = "electric-green sneakers"
greyscale_colors = "#D5E04B#ffffff"

/obj/item/clothing/shoes/sneakers/orange
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/sneakers_orange/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/sneakers_orange/worn/digi)
Expand Down
23 changes: 23 additions & 0 deletions modular_doppler/modular_cosmetics/code/suits/basesuits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,52 @@
supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE)
bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi',
BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat_digi.dmi')
icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi'

//God damnit TG you *fuckwits*, why didn't you subtype these properly
/obj/item/clothing/suit/toggle/labcoat/genetics
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/chemist
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
greyscale_colors = "#547E64#D5E04B#D5E04B#A2A947"
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/virologist
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
greyscale_colors = "#547E64#4D9BE6#4D9BE6#4D65B4"
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/coroner
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
greyscale_colors = "#696F80#547E64#547E64#374E4A"
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/science
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/roboticist
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/suit/toggle/labcoat/interdyne
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/suit/toggle/labcoat/custom
name = "custom labcoat"
desc = "A suit that protects against minor chemical spills. This one's custom!"
icon_state = "labcoat_job"
greyscale_config = /datum/greyscale_config/labcoat
greyscale_config_worn = /datum/greyscale_config/labcoat/worn
greyscale_colors = "#EEEEEE#EEEEEE#EEEEEE#EEEEEE"
greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/labcoat/worn,
BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/labcoat/worn/digi)
flags_1 = IS_PLAYER_COLORABLE_1



Expand Down
11 changes: 11 additions & 0 deletions modular_doppler/modular_cosmetics/code/under/base_overrides.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// ==MEDICAL BREAKER==
/obj/item/clothing/under/rank/medical
icon = 'modular_doppler/modular_cosmetics/icons/obj/under/base/medical.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/base/medical.dmi'



/// ==ENGINEERING BREAKER==
/obj/item/clothing/under/rank/engineering
icon = 'modular_doppler/modular_cosmetics/icons/obj/under/base/engineering.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/base/engineering.dmi'
18 changes: 18 additions & 0 deletions modular_doppler/modular_cosmetics/code/uniform_overrides.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,21 @@
/datum/colored_assistant/random
jumpsuits = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls/random)
jumpskirts = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls/random) // DITTO: see above

// medical sneaker overrides (Misery)
/datum/outfit/job/cmo
shoes = /obj/item/clothing/shoes/sneakers/doppler/med_green
/datum/outfit/job/doctor
shoes = /obj/item/clothing/shoes/sneakers/doppler/med_green
/datum/outfit/job/chemist
shoes = /obj/item/clothing/shoes/sneakers/doppler/cmd_electric
/datum/outfit/job/paramedic
shoes = /obj/item/clothing/shoes/sneakers/doppler/med_green

// ditto but engineering edition
/datum/outfit/job/ce
shoes = /obj/item/clothing/shoes/sneakers/doppler/eng_orange
/datum/outfit/job/engineer
shoes = /obj/item/clothing/shoes/sneakers/doppler/eng_orange
/datum/outfit/job/atmos
shoes = /obj/item/clothing/shoes/sneakers/doppler/eng_orange
Binary file added modular_doppler/modular_cosmetics/icons/mob/head/base/medical.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/mob/suit/labcoat_digi.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_doppler/modular_cosmetics/icons/mob/under/base/engineering.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_doppler/modular_cosmetics/icons/mob/under/base/medical.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_doppler/modular_cosmetics/icons/obj/head/base/medical.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_doppler/modular_cosmetics/icons/obj/under/base/engineering.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_doppler/modular_cosmetics/icons/obj/under/base/medical.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6775,6 +6775,7 @@
#include "modular_doppler\modular_cosmetics\code\hands\gloves.dm"
#include "modular_doppler\modular_cosmetics\code\hands\rings.dm"
#include "modular_doppler\modular_cosmetics\code\hats\doppler_command_hats.dm"
#include "modular_doppler\modular_cosmetics\code\head\basehead_edits.dm"
#include "modular_doppler\modular_cosmetics\code\head\bows.dm"
#include "modular_doppler\modular_cosmetics\code\head\hair_tie.dm"
#include "modular_doppler\modular_cosmetics\code\head\hats.dm"
Expand All @@ -6794,6 +6795,7 @@
#include "modular_doppler\modular_cosmetics\code\suits\misc.dm"
#include "modular_doppler\modular_cosmetics\code\suits\modsuit.dm"
#include "modular_doppler\modular_cosmetics\code\suits\shirts.dm"
#include "modular_doppler\modular_cosmetics\code\under\base_overrides.dm"
#include "modular_doppler\modular_cosmetics\code\under\doppler_uniforms.dm"
#include "modular_doppler\modular_cosmetics\code\under\dresses.dm"
#include "modular_doppler\modular_cosmetics\code\under\medical_extra.dm"
Expand Down
Loading