Skip to content

Commit

Permalink
я еблан
Browse files Browse the repository at this point in the history
  • Loading branch information
Kar4es committed Dec 5, 2024
1 parent f5d0eda commit 1f0554f
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion modular_ss220/mod/_mods.dme
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "_mods.dm"

#include "code/mod_clothes.dm"
#include "code/mod_control.dm"
#include "code/mod_modules.dm"
#include "code/mod_theme.dm"
#include "code/mod_clothes.dm"
#include "code/mod_types.dm"
8 changes: 4 additions & 4 deletions modular_ss220/mod/code/mod_clothes.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// MARK: MODsuit clothes
/obj/item/mod/head/mod/exclusive
/obj/item/clothing/head/mod/exclusive
icon = 'modular_ss220/mod/icons/object/mod_clothing.dmi'
item_state = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
Expand All @@ -12,7 +12,7 @@
"Vox" = 'modular_ss220/mod/icons/mob/species/vox/mod_clothing.dmi',
)

/obj/item/mod/suit/mod/exclusive
/obj/item/clothing/suit/mod/exclusive
icon = 'modular_ss220/mod/icons/object/mod_clothing.dmi'
item_state = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
Expand All @@ -25,7 +25,7 @@
"Vox" = 'modular_ss220/mod/icons/mob/species/vox/mod_clothing.dmi',
)

/obj/item/mod/gloves/mod/exclusive
/obj/item/clothing/gloves/mod/exclusive
icon = 'modular_ss220/mod/icons/object/mod_clothing.dmi'
item_state = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
Expand All @@ -38,7 +38,7 @@
"Vox" = 'modular_ss220/mod/icons/mob/species/vox/mod_clothing.dmi',
)

/obj/item/mod/shoes/mod/exclusive
/obj/item/clothing/shoes/mod/exclusive
icon = 'modular_ss220/mod/icons/object/mod_clothing.dmi'
item_state = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
Expand Down
32 changes: 16 additions & 16 deletions modular_ss220/mod/code/mod_control.dm
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// MARK: MODsuit control
/obj/item/mod/control/proc/build_head()
return new /obj/item/mod/head/mod(src)
return new /obj/item/clothing/head/mod(src)

/obj/item/mod/control/proc/build_suit()
return new /obj/item/mod/suit/mod(src)
return new /obj/item/clothing/suit/mod(src)

/obj/item/mod/control/proc/build_gloves()
return new /obj/item/mod/gloves/mod(src)
return new /obj/item/clothing/gloves/mod(src)

/obj/item/mod/control/proc/build_shoes()
return new /obj/item/mod/shoes/mod(src)
return new /obj/item/clothing/shoes/mod(src)

/obj/item/mod/control/proc/is_any_part_deployed()
for(var/obj/item/part as anything in mod_parts)
Expand Down Expand Up @@ -52,39 +52,39 @@
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'

/obj/item/mod/control/pre_equipped/exclusive/build_head()
return new /obj/item/mod/head/mod/exclusive(src)
return new /obj/item/clothing/head/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/exclusive/build_suit()
return new /obj/item/mod/suit/mod/exclusive(src)
return new /obj/item/clothing/suit/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/exclusive/build_gloves()
return new /obj/item/mod/gloves/mod/exclusive(src)
return new /obj/item/clothing/gloves/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/exclusive/build_shoes()
return new /obj/item/mod/shoes/mod/exclusive(src)
return new /obj/item/clothing/shoes/mod/exclusive(src)

//MARK: Corporate
/obj/item/mod/control/pre_equipped/corporate/build_head()
return new /obj/item/mod/head/mod/exclusive(src)
return new /obj/item/clothing/head/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/corporate/build_suit()
return new /obj/item/mod/suit/mod/exclusive(src)
return new /obj/item/clothing/suit/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/corporate/build_gloves()
return new /obj/item/mod/gloves/mod/exclusive(src)
return new /obj/item/clothing/gloves/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/corporate/build_shoes()
return new /obj/item/mod/shoes/mod/exclusive(src)
return new /obj/item/clothing/shoes/mod/exclusive(src)

//MARK: ERT Red
/obj/item/mod/control/pre_equipped/responsory/red/build_head()
return new /obj/item/mod/head/mod/exclusive(src)
return new /obj/item/clothing/head/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/responsory/red/build_suit()
return new /obj/item/mod/suit/mod/exclusive(src)
return new /obj/item/clothing/suit/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/responsory/red/build_gloves()
return new /obj/item/mod/gloves/mod/exclusive(src)
return new /obj/item/clothing/gloves/mod/exclusive(src)

/obj/item/mod/control/pre_equipped/responsory/red/build_shoes()
return new /obj/item/mod/shoes/mod/exclusive(src)
return new /obj/item/clothing/shoes/mod/exclusive(src)
2 changes: 1 addition & 1 deletion modular_ss220/mod/code/mod_modules.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/item/mod/module/insignia
/obj/item/mod/module/insignia/red
icon = 'modular_ss220/mod/icons/object/mod_modules.dmi'
name = "MOD insignia module"
desc = "Despite the existence of IFF systems, radio communique, and modern methods of deductive reasoning involving \
Expand Down
3 changes: 1 addition & 2 deletions modular_ss220/mod/code/mod_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'

// MARK: ERT RED MODsuit

/obj/item/mod/control/pre_equipped/responsory/red
icon = 'modular_ss220/mod/icons/object/mod_clothing.dmi'
icon_override = 'modular_ss220/mod/icons/mob/mod_clothing.dmi'
Expand All @@ -60,4 +59,4 @@
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/ert_camera,
)

insignia_type = /obj/item/mod/module/insignia/red
Binary file modified modular_ss220/mod/icons/mob/mod_clothing.dmi
Binary file not shown.
Binary file added modular_ss220/mod/icons/mob/mod_modules.dmi
Binary file not shown.
Binary file modified modular_ss220/mod/icons/object/mod_clothing.dmi
Binary file not shown.

0 comments on commit 1f0554f

Please sign in to comment.