Skip to content

Commit

Permalink
sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Aug 3, 2023
1 parent 3f4d83c commit 1090810
Show file tree
Hide file tree
Showing 16 changed files with 102 additions and 14 deletions.
1 change: 1 addition & 0 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4330,6 +4330,7 @@
#include "code\modules\rigsuits\themes\station\civilian.dm"
#include "code\modules\rigsuits\themes\station\command.dm"
#include "code\modules\rigsuits\themes\station\engineering.dm"
#include "code\modules\rigsuits\themes\station\exploration.dm"
#include "code\modules\rigsuits\themes\station\medical.dm"
#include "code\modules\rigsuits\themes\station\science.dm"
#include "code\modules\rigsuits\themes\station\security.dm"
Expand Down
3 changes: 1 addition & 2 deletions code/modules/rigsuits/themes/faction/nanotrasen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
control_sealed_append = ""
desc = "TBD"
fluff_desc = "TBD"

#warn impl
#warn impl


3 changes: 1 addition & 2 deletions code/modules/rigsuits/themes/station/cargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@
fluff_desc = "TBD"
display_name = "salvage"
visible_name = "Salvage"

#warn impl
#warn impl
3 changes: 1 addition & 2 deletions code/modules/rigsuits/themes/station/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@
fluff_desc = "TBD"
display_name = "standard"
visible_name = "Standard"

#warn impl
#warn impl
5 changes: 3 additions & 2 deletions code/modules/rigsuits/themes/station/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
fluff_desc = "TBD"
display_name = "engineering"
visible_name = "Engineering"
#warn impl

/datum/rig_theme/station/engineering/atmospherics
name = "atmospherics rig"
Expand All @@ -20,6 +21,7 @@
fluff_desc = "TBD"
display_name = "atmospherics"
visible_name = "Atmospherics"
#warn impl

/datum/rig_theme/station/engineering/advanced
name = "advanced rig"
Expand All @@ -28,5 +30,4 @@
fluff_desc = "TBD"
display_name = "advanced"
visible_name = "Advanced"

#warn impl
#warn impl
54 changes: 54 additions & 0 deletions code/modules/rigsuits/themes/station/exploration.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2023 Citadel Station developers. *//

/datum/rig_theme/station/exploration
abstract_type = /datum/rig_theme/station/exploration
base_icon = 'icons/modules/rigsuits/suits/station/exploration.dmi'
pieces = list(
/datum/rig_piece/helmet,
/datum/rig_piece/chestplate,
/datum/rig_piece/gloves,
/datum/rig_piece/boots{
base_state_when_unsealed = "";
base_state_when_sealed = "";
},
)
control_base_state_worn = ""
control_sealed_append = ""

/datum/rig_theme/station/exploration/standard
name = "excursion rig"
base_state = "explo"
desc = "TBD"
fluff_desc = "TBD"
display_name = "excursion"
visible_name = "excursion"
#warn impl

/datum/rig_theme/station/exploration/pathfinder
name = "pathfinder rig"
base_state = "pf"
desc = "TBD"
fluff_desc = "TBD"
display_name = "pathfinder"
visible_name = "pathfinder"
control_base_state_worn = null
#warn impl

/datum/rig_theme/station/exploration/medic
name = "field medic rig"
base_state = "medic"
desc = "TBD"
fluff_desc = "TBD"
display_name = "medic"
visible_name = "medic"
#warn impl

/datum/rig_theme/station/exploration/pilot
name = "pilot rig"
base_state = "pilot"
desc = "TBD"
fluff_desc = "TBD"
display_name = "pilot"
visible_name = "pilot"
#warn impl
3 changes: 1 addition & 2 deletions code/modules/rigsuits/themes/station/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@
worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TAJARAN, BODYTYPE_IPC);
},
)

#warn impl
#warn impl
3 changes: 1 addition & 2 deletions code/modules/rigsuits/themes/station/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@
fluff_desc = "TBD"
display_name = "security"
visible_name = "Security"

#warn impl
#warn impl
41 changes: 39 additions & 2 deletions code/modules/rigsuits/themes/theme.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,39 @@
var/base_icon
/// base icon state
/// combined as "[base_state][piece_state_append][sealed_state_append]" to get final state
/// the x_base_when_un/sealed vars can modify this.
var/base_state
/// control module state
var/control_state_append = "-control"
/// control module sealed append
var/control_sealed_append = "-sealed"
/// control module uses base state when unsealed; defaults to base_state
var/control_base_state_unsealed
/// control module uses base state when sealed; defaults to base_state
var/control_base_state_sealed
/// control module worn icon uses base state; defaults to base_state
var/control_base_state_worn

#warn coloration system start

/datum/rig_theme/New()
#warn init pieces
var/list/old_pieces = pieces
pieces = list()
for(var/path in old_pieces)
add_piece(path)

/datum/rig_theme/proc/imprint_appearance(obj/item/rig/control_module)
#warn impl

/datum/rig_theme/proc/add_piece(datum/rig_piece/piece_path)
if(ispath(piece_path))
piece_path = new piece_path
#warn imprint piece with base states

/**
* RIG piece definition datums
* Should only ever be belonging to one /datum/rig_theme at a time.
*/
/datum/rig_piece
abstract_type = /datum/rig_piece
/// path
Expand All @@ -55,6 +77,12 @@
var/piece_state_append
/// sealed state append
var/sealed_state_append = "-sealed"
/// base state used while unsealed - defaults to rig theme
var/base_state_unsealed
/// base state used while sealed - defaults to rig theme
var/base_state_sealed
/// base state used when worn - defaults to rig theme
var/base_state_worn
/// worn rendering flags
var/worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
/// bodytypes implemented
Expand All @@ -78,7 +106,16 @@
/datum/rig_piece/proc/instantiate()
ASSERT(ispath(path, /obj/item))
var/obj/item/created_item = new path
var/datum/component/rig_piece/created_piece = created_item.AddComponent(/datum/component/rig_piece)
var/datum/component/rig_piece/created_piece = created_item.AddComponent(/datum/component/rig_piece, src)
imprint_appearance(created_piece)
imprint_behavior(piece_component)
#warn impl

/datum/rig_piece/proc/imprint_appearance(datum/component/rig_piece/piece_component)
#warn impl

/datum/rig_piece/proc/imprint_behavior(datum/component/rig_piece/piece_component)
#warn impl

/datum/rig_piece/helmet
display_name = "helmet"
Expand Down
Binary file removed icons/modules/rigsuits/baylikes/clothing13.dmi
Binary file not shown.
Binary file added icons/modules/rigsuits/baylikes/clothing14.dmi
Binary file not shown.
Binary file modified icons/modules/rigsuits/baylikes/polaris_mobchest.dmi
Binary file not shown.
Binary file modified icons/modules/rigsuits/baylikes/polaris_mobgloves.dmi
Binary file not shown.
Binary file modified icons/modules/rigsuits/baylikes/polaris_mobhead.dmi
Binary file not shown.
Binary file modified icons/modules/rigsuits/baylikes/polaris_mobshoes.dmi
Binary file not shown.
Binary file modified icons/modules/rigsuits/suits/exploration.dmi
Binary file not shown.

0 comments on commit 1090810

Please sign in to comment.