Skip to content

Commit

Permalink
[MAP] Pioneer update (#3201)
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest authored Feb 15, 2025
1 parent f292d9d commit 02086f1
Show file tree
Hide file tree
Showing 16 changed files with 370 additions and 304 deletions.
2 changes: 2 additions & 0 deletions mods/_maps/farfleet/code/farfleet_crew.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
min_skill = list(SKILL_COMBAT = SKILL_BASIC,
SKILL_WEAPONS = SKILL_BASIC,
SKILL_HAULING = SKILL_BASIC,
SKILL_SCIENCE = SKILL_BASIC,
SKILL_MEDICAL = SKILL_BASIC,
SKILL_EVA = SKILL_BASIC)

Expand All @@ -143,6 +144,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
min_skill = list(SKILL_COMBAT = SKILL_BASIC,
SKILL_WEAPONS = SKILL_BASIC,
SKILL_HAULING = SKILL_BASIC,
SKILL_SCIENCE = SKILL_BASIC,
SKILL_MEDICAL = SKILL_BASIC,
SKILL_PILOT = SKILL_TRAINED,
SKILL_EVA = SKILL_BASIC)
Expand Down
44 changes: 44 additions & 0 deletions mods/_maps/farfleet/code/farfleet_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@
desc = "HelTek LA-700 is a standart equipment of ICCG Space-assault Forces. Looks very similiar to STS-35."
icon = 'mods/_maps/farfleet/icons/obj/iccg_rifle.dmi'
icon_state = "iccg_rifle"
item_state = "arifle"
item_icons = list(
slot_r_hand_str = 'mods/_maps/farfleet/icons/mob/righthand.dmi',
slot_l_hand_str = 'mods/_maps/farfleet/icons/mob/lefthand.dmi',
)

/obj/item/gun/projectile/automatic/assault_rifle/heltek/on_update_icon()
..()
Expand Down Expand Up @@ -286,6 +291,7 @@
/obj/item/rig/pioneer
name = "pioneer corps suit control module"
desc = "A ridiculously bulky military hardsuit with PC-13AA inscription and a small ICCG crest on its control module. This suit's armor plates mostly replaced with anomaly and radiation shielding."
icon = 'mods/_maps/farfleet/icons/obj/rig_modules.dmi'
suit_type = "heavy"
icon_state = "gcc_rig"
online_slowdown = 2 ///chunky
Expand Down Expand Up @@ -332,9 +338,21 @@
)

/obj/item/clothing/gloves/rig/pioneer
icon = 'mods/_maps/farfleet/icons/obj/obj_hands.dmi'
item_icons = list(slot_gloves_str = 'mods/_maps/farfleet/icons/mob/onmob_hands.dmi')
siemens_coefficient = 0

/obj/item/clothing/shoes/magboots/rig/pioneer
icon = 'mods/_maps/farfleet/icons/obj/obj_feet.dmi'
item_icons = list(slot_shoes_str = 'mods/_maps/farfleet/icons/mob/onmob_feet.dmi')

/obj/item/clothing/head/helmet/space/rig/pioneer
icon = 'mods/_maps/farfleet/icons/obj/obj_head.dmi'
item_icons = list(slot_head_str = 'mods/_maps/farfleet/icons/mob/onmob_head.dmi')

/obj/item/clothing/suit/space/rig/pioneer
icon = 'mods/_maps/farfleet/icons/obj/obj_suit.dmi'
item_icons = list(slot_wear_suit_str = 'mods/_maps/farfleet/icons/mob/onmob_suit.dmi')

/obj/item/rig/pioneer/sergeant
name = "pioneer corps sergeant suit control module"
Expand All @@ -352,6 +370,32 @@
/obj/item/rig_module/maneuvering_jets
)

/obj/item/rig/pioneer/on_update_icon(update_mob_icon)

ClearOverlays()
if(!mob_icon || update_mob_icon)
var/species_icon = 'mods/_maps/farfleet/icons/mob/onmob_rig_back.dmi'
if(wearer && sprite_sheets && sprite_sheets[wearer.species.get_bodytype(wearer)])
species_icon = sprite_sheets[wearer.species.get_bodytype(wearer)]
mob_icon = image("icon" = species_icon, "icon_state" = "[icon_state]")

if(equipment_overlay_icon && LAZYLEN(installed_modules))
for(var/obj/item/rig_module/module in installed_modules)
if(module.suit_overlay)
var/overlay = image("icon" = equipment_overlay_icon, "icon_state" = "[module.suit_overlay]", "dir" = SOUTH)
chest.AddOverlays(overlay)

if(wearer)
wearer.update_inv_shoes()
wearer.update_inv_gloves()
wearer.update_inv_head()
wearer.update_inv_wear_mask()
wearer.update_inv_wear_suit()
wearer.update_inv_w_uniform()
wearer.update_inv_back()
return


/* MISC
* ========
*/
Expand Down
Binary file modified mods/_maps/farfleet/icons/mob/lefthand.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/mob/onmob_feet.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/mob/onmob_hands.dmi
Binary file not shown.
Binary file modified mods/_maps/farfleet/icons/mob/onmob_head.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/mob/onmob_rig_back.dmi
Binary file not shown.
Binary file modified mods/_maps/farfleet/icons/mob/onmob_suit.dmi
Binary file not shown.
Binary file modified mods/_maps/farfleet/icons/mob/righthand.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/obj/obj_feet.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/obj/obj_hands.dmi
Binary file not shown.
Binary file modified mods/_maps/farfleet/icons/obj/obj_head.dmi
Binary file not shown.
Binary file modified mods/_maps/farfleet/icons/obj/obj_suit.dmi
Binary file not shown.
Binary file added mods/_maps/farfleet/icons/obj/rig_modules.dmi
Binary file not shown.
Loading

0 comments on commit 02086f1

Please sign in to comment.