diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index fa0c99dcb6..87507cc936 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,6 +1,6 @@ /atom/movable layer = OBJ_LAYER - appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER //VOREStation Edit + appearance_flags = TILE_BOUND|PIXEL_SCALE var/last_move = null var/anchored = 0 // var/elevation = 2 - not used anywhere diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index 04e760a0d5..55a5ebde8b 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -634,6 +634,9 @@ /obj/item/clothing/under/dress/sailordress = 5, /obj/item/clothing/under/dress/sari = 5, /obj/item/clothing/under/dress/sari/green = 5, + /obj/item/clothing/under/dress/qipao = 5, + /obj/item/clothing/under/dress/qipao/red = 5, + /obj/item/clothing/under/dress/qipao/white = 5, /obj/item/clothing/under/shorts/red = 5, /obj/item/clothing/under/shorts/green = 5, /obj/item/clothing/under/shorts/blue = 5, @@ -801,6 +804,9 @@ /obj/item/clothing/under/dress/sailordress = 100, /obj/item/clothing/under/dress/sari = 100, /obj/item/clothing/under/dress/sari/green = 100, + /obj/item/clothing/under/dress/qipao = 100, + /obj/item/clothing/under/dress/qipao/red = 100, + /obj/item/clothing/under/dress/qipao/white = 100, /obj/item/clothing/under/shorts/red = 100, /obj/item/clothing/under/shorts/green = 100, /obj/item/clothing/under/shorts/blue = 100, diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 57f70d3e1e..b56d5d62e3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -179,3 +179,18 @@ Swimsuits display_name = "sleek modern coat, detective" path = /obj/item/clothing/under/detective_alt allowed_roles = list("Head of Security", "Detective") + +/* +Qipao +*/ +/datum/gear/uniform/qipao + display_name = "qipao, black" + path = /obj/item/clothing/under/dress/qipao + +/datum/gear/uniform/qipao_red + display_name = "qipao, red" + path = /obj/item/clothing/under/dress/qipao/red + +/datum/gear/uniform/qipao_white + display_name = "qipao, white" + path = /obj/item/clothing/under/dress/qipao/white diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 82cae35465..b9e9bffaef 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -5,3 +5,17 @@ icon = 'icons/obj/clothing/hats_vr.dmi' icon_override = 'icons/mob/head_vr.dmi' flags_inv = HIDEEARS|BLOCKHAIR + +/obj/item/clothing/head/crown + name = "crown" + desc = "How regal!" + icon_state = "crown" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + +/obj/item/clothing/head/fancy_crown + name = "fancy crown" + desc = "How extraordinarily regal!" + icon_state = "fancycrown" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' diff --git a/code/modules/clothing/shoes/miscellaneous_vr.dm b/code/modules/clothing/shoes/miscellaneous_vr.dm index 13ac1af3f4..60e9f36381 100644 --- a/code/modules/clothing/shoes/miscellaneous_vr.dm +++ b/code/modules/clothing/shoes/miscellaneous_vr.dm @@ -4,7 +4,7 @@ icon_state = "griffinboots" item_state = "griffinboots" icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' // This appends "_r" "_l" to icon state + icon_override = 'icons/mob/feet_vr.dmi' /obj/item/clothing/shoes/bhop name = "jump boots" @@ -12,7 +12,7 @@ icon_state = "jetboots" item_state = "jetboots" icon = 'icons/obj/clothing/shoes_vr.dmi' - icon_override = 'icons/mob/feet_vr.dmi' // This appends "_r" "_l" to icon state + icon_override = 'icons/mob/feet_vr.dmi' // resistance_flags = FIRE_PROOF action_button_name = "Activate Jump Boots" permeability_coefficient = 0.05 @@ -40,3 +40,20 @@ user.visible_message("[user] dashes forward into the air!") user.throw_at(target, jumpdistance, jumpspeed) recharging_time = world.time + recharging_rate + +/obj/item/clothing/shoes/magboots/adv + name = "advanced magboots" + desc = "Advanced magnetic boots for a trained user. They have a lower magnetic force, allowing the user to move more quickly." + icon = 'icons/obj/clothing/shoes_vr.dmi' + icon_override = 'icons/mob/feet_vr.dmi' + + icon_state = "advmag0" + item_flags = PHORONGUARD + item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots") + icon_base = "advmag" + +/obj/item/clothing/shoes/magboots/adv/set_slowdown() + if(magpulse) + slowdown = shoes ? max(SHOES_SLOWDOWN, shoes.slowdown) : SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. + else if(shoes) + slowdown = shoes.slowdown \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index b82f18d2fe..2e418b175b 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -64,3 +64,72 @@ // This variable is normally used to set the icon_override when the suit is refitted, // however the species spritesheet now means we no longer need that anyway! sprite_sheets_refit = list() + +/obj/item/clothing/head/helmet/space/void/heck + name = "\improper H.E.C.K. helmet" + desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner." + icon_state = "hostile_env" + item_state = "hostile_env" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) + +/obj/item/clothing/head/helmet/space/void/heck/Initialize() + . = ..() + var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass") + glass_overlay.appearance_flags = RESET_COLOR + add_overlay(glass_overlay) + +/obj/item/clothing/head/helmet/space/void/heck/apply_accessories(var/image/standing) + . = ..() + var/mutable_appearance/glass_overlay = mutable_appearance(icon_override, "hostile_env_glass") + glass_overlay.appearance_flags = KEEP_APART|RESET_COLOR + standing.add_overlay(glass_overlay) + return standing + +/obj/item/clothing/suit/space/void/heck + name = "\improper H.E.C.K. suit" + desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner." + icon_state = "hostile_env" + item_state = "hostile_env" + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' + slowdown = 1.5 + armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) + +/obj/item/clothing/head/helmet/space/void/syndicate_contract + name = "syndicate contract helmet" + desc = "A free helmet, gifted you by your new not-quite-corporate master!" + icon_state = "syndicate-contract" + item_state = "syndicate-contract" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_MERCENARY) + +/obj/item/clothing/suit/space/void/syndicate_contract + name = "syndicate contract suit" + desc = "A free suit, gifted you by your new not-quite-corporate master!" + icon_state = "syndicate-contract" + item_state = "syndicate-contract" + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) + siemens_coefficient = 0.6 + +/obj/item/clothing/head/helmet/space/void/chrono + name = "chrono-helmet" + desc = "From out of space and time, this helmet will protect you while you perform your duties." + icon_state = "chronohelmet" + item_state = "chronohelmet" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + +/obj/item/clothing/suit/space/void/chrono + name = "chrono-suit" + desc = "From out of space and time, this helmet will protect you while you perform your duties." + icon_state = "chronosuit" + item_state = "chronosuit" + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index c1982a58ce..0da22a69d9 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -1,3 +1,18 @@ /obj/item/clothing/head/bomb_hood/security icon_state = "bombsuitsec" body_parts_covered = HEAD + +/obj/item/clothing/suit/storage/toggle/paramedic + name = "paramedic vest" + desc = "A vest that protects against minor chemical spills." + icon = 'icons/obj/clothing/suits_vr.dmi' + icon_override = 'icons/mob/suit_vr.dmi' + icon_state = "paramedic-vest" + item_state = "paramedic-vest" + item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat") + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO + flags_inv = HIDEHOLSTER + allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + index = 1 \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 2c48b859a2..aa84df42fc 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -108,4 +108,21 @@ //Same as Nanotrasen Security Uniforms /obj/item/clothing/under/ert - armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) \ No newline at end of file + armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) + +/obj/item/clothing/under/dress/qipao + name = "qipao" + icon = 'icons/obj/clothing/uniforms_vr.dmi' + icon_override = 'icons/mob/uniform_vr.dmi' + icon_state = "qipao" + item_state = "qipao" + +/obj/item/clothing/under/dress/qipao/white + name = "white qipao" + icon_state = "qipao_white" + item_state = "qipao_white" + +/obj/item/clothing/under/dress/qipao/red + name = "red qipao" + icon_state = "qipao_red" + item_state = "qipao_red" diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 6e9b96fc13..b3f38e8013 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -4,6 +4,7 @@ /mob/living var/ooc_notes = null var/obj/structure/mob_spawner/source_spawner = null + appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER //custom say verbs var/custom_say = null diff --git a/icons/mob/feet_vr.dmi b/icons/mob/feet_vr.dmi index 41062144df..800d211b20 100644 Binary files a/icons/mob/feet_vr.dmi and b/icons/mob/feet_vr.dmi differ diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index 3db239e18d..57bd8f01cb 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/icons/mob/suit_vr.dmi b/icons/mob/suit_vr.dmi index 12cada28eb..5df054af1e 100644 Binary files a/icons/mob/suit_vr.dmi and b/icons/mob/suit_vr.dmi differ diff --git a/icons/mob/uniform_vr.dmi b/icons/mob/uniform_vr.dmi index 616348ced9..9d0cf74b0e 100644 Binary files a/icons/mob/uniform_vr.dmi and b/icons/mob/uniform_vr.dmi differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi index f2d9773b0b..a2cec1a3ba 100644 Binary files a/icons/obj/clothing/hats_vr.dmi and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/icons/obj/clothing/shoes_vr.dmi b/icons/obj/clothing/shoes_vr.dmi index aa3269278c..6b4534a217 100644 Binary files a/icons/obj/clothing/shoes_vr.dmi and b/icons/obj/clothing/shoes_vr.dmi differ diff --git a/icons/obj/clothing/suits_vr.dmi b/icons/obj/clothing/suits_vr.dmi index a10d6cc9ea..972284dae7 100644 Binary files a/icons/obj/clothing/suits_vr.dmi and b/icons/obj/clothing/suits_vr.dmi differ diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/obj/clothing/uniforms_vr.dmi index b5858c9fa5..2f3ea7266b 100644 Binary files a/icons/obj/clothing/uniforms_vr.dmi and b/icons/obj/clothing/uniforms_vr.dmi differ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index bc473fd7da..c128308941 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -19697,6 +19697,7 @@ }, /obj/item/clothing/mask/breath, /obj/item/weapon/rig/ce/equipped, +/obj/item/clothing/shoes/magboots/adv, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aQh" = (