diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png index 9f591d0cdbae0a..cfbd40f8db7b87 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png differ diff --git a/modular_skyrat/master_files/code/datums/traits/good.dm b/modular_skyrat/master_files/code/datums/traits/good.dm index 1a5a6d9d26e698..aa71af7edeb464 100644 --- a/modular_skyrat/master_files/code/datums/traits/good.dm +++ b/modular_skyrat/master_files/code/datums/traits/good.dm @@ -128,3 +128,42 @@ lose_text = span_danger("Somehow, you've completely cleaned yourself of glitter..") medical_record_text = "Patient seems to be looking fabulous." icon = FA_ICON_HAND_SPARKLES + +/datum/quirk/no_appendix + name = "Appendicitis Survivor" + desc = "You had a run in with appendicitis in the past and no longer have an appendix." + icon = FA_ICON_NOTES_MEDICAL + value = 2 + gain_text = span_notice("You no longer have an appendix.") + lose_text = span_danger("Your appendix has magically.. regrown?") + medical_record_text = "Patient had appendicitis in the past and has had their appendix surgically removed." + /// The mob's original appendix + var/obj/item/organ/internal/appendix/old_appendix + +/datum/quirk/no_appendix/post_add() + var/mob/living/carbon/carbon_quirk_holder = quirk_holder + old_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX) + + if(isnull(old_appendix)) + return + + old_appendix.Remove(carbon_quirk_holder, special = TRUE) + old_appendix.moveToNullspace() + + STOP_PROCESSING(SSobj, old_appendix) + +/datum/quirk/no_appendix/remove() + var/mob/living/carbon/carbon_quirk_holder = quirk_holder + + if(isnull(old_appendix)) + return + + var/obj/item/organ/internal/appendix/current_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX) + + // if we have not gained an appendix already, put the old one back + if(isnull(current_appendix)) + old_appendix.Insert(carbon_quirk_holder, special = TRUE) + else + qdel(old_appendix) + + old_appendix = null diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/belt.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/belt.dmi index b8ef83345d25ac..96e88beb2a8d42 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/vox/belt.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/belt.dmi differ diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 62a8744a7dc9a3..b8b8aa6c77cdc3 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -295,6 +295,32 @@ name = "Colourable Sterile Mask (Worn) (Teshari)" icon_file = 'modular_skyrat/modules/GAGS/icons/masks_teshari.dmi' +// MASQUERADE MASKS +/datum/greyscale_config/masquerade_mask + name = "Masquerade Mask" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json' + +/datum/greyscale_config/masquerade_mask/worn + name = "Masquerade Mask (Worn)" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi' + +/datum/greyscale_config/masquerade_mask/worn/snouted + name = "Masquerade Mask (Worn) (Snouted)" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_snouted.dmi' + +/datum/greyscale_config/masquerade_mask/worn/teshari + name = "Masquerade Mask (Worn) (Teshari)" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_teshari.dmi' + +/datum/greyscale_config/masquerade_mask/worn/better_vox + name = "Masquerade Mask (Worn) (Vox Primalis)" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_better_vox.dmi' + +/datum/greyscale_config/masquerade_mask/worn/vox + name = "Masquerade Mask (Worn) (Vox)" + icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_vox.dmi' + /* * NECK */ diff --git a/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi index 219995affaf54c..d8ebca6325a8ae 100644 Binary files a/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi and b/modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi new file mode 100644 index 00000000000000..6d80601a2be2ea Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi new file mode 100644 index 00000000000000..a080bb7d2e7393 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_better_vox.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_better_vox.dmi new file mode 100644 index 00000000000000..58532e78ec84e5 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_better_vox.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_snouted.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_snouted.dmi new file mode 100644 index 00000000000000..39076d1e30d70f Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_snouted.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_teshari.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_teshari.dmi new file mode 100644 index 00000000000000..694f600739b33f Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_teshari.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_vox.dmi b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_vox.dmi new file mode 100644 index 00000000000000..720e1b04b685d1 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_vox.dmi differ diff --git a/modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json b/modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json new file mode 100644 index 00000000000000..0bbac3ac83291d --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json @@ -0,0 +1,58 @@ +{ + "maskerade": [ + { + "type": "icon_state", + "icon_state": "mask", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "maskerade_two_colors": [ + { + "type": "icon_state", + "icon_state": "mask_left", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "mask_right", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "maskerade_feather": [ + { + "type": "icon_state", + "icon_state": "mask", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "mask_feather", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "maskerade_two_colors_feather": [ + { + "type": "icon_state", + "icon_state": "mask_left", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "mask_right", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "mask_feather", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_skyrat/modules/better_vox/icons/clothing/back.dmi b/modular_skyrat/modules/better_vox/icons/clothing/back.dmi index 58b25444b2d481..42342b96804077 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/back.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/back.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/eyes.dmi b/modular_skyrat/modules/better_vox/icons/clothing/eyes.dmi index 6892b304eedebb..26b37734495f0c 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/eyes.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/eyes.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/hands.dmi b/modular_skyrat/modules/better_vox/icons/clothing/hands.dmi index 6422ead97f5b80..469c38786d84ce 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/hands.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/hands.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/head.dmi b/modular_skyrat/modules/better_vox/icons/clothing/head.dmi index 6f1f5fb4618ffe..80359e0b64a73a 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/head.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/head.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/helmet.dmi b/modular_skyrat/modules/better_vox/icons/clothing/helmet.dmi index f4d7beca5915cd..91bf16af315b1a 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/helmet.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/helmet.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/mask.dmi b/modular_skyrat/modules/better_vox/icons/clothing/mask.dmi index cc76f904848750..dbabde45004336 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/mask.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/mask.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/mod.dmi b/modular_skyrat/modules/better_vox/icons/clothing/mod.dmi index b1c272b0ccdd33..cac11dd1d3ecb9 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/mod.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/mod.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/neck.dmi b/modular_skyrat/modules/better_vox/icons/clothing/neck.dmi new file mode 100644 index 00000000000000..33762ac78ef35f Binary files /dev/null and b/modular_skyrat/modules/better_vox/icons/clothing/neck.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi b/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi index adfd1c200c55cd..31d22fbbe8397c 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi differ diff --git a/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi b/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi index 7b7ae9a2af5934..a126c64ad0ed26 100644 Binary files a/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi differ diff --git a/modular_skyrat/modules/clock_cult/code/items/clockwork_slab.dm b/modular_skyrat/modules/clock_cult/code/items/clockwork_slab.dm index 8f8f51379ea662..30561068759c20 100644 --- a/modular_skyrat/modules/clock_cult/code/items/clockwork_slab.dm +++ b/modular_skyrat/modules/clock_cult/code/items/clockwork_slab.dm @@ -81,10 +81,10 @@ GLOBAL_LIST_INIT(clockwork_slabs, list()) . = ..() //Clear quickbinds for(var/datum/action/innate/clockcult/quick_bind/script as anything in quick_bound_scriptures) - script.Remove(user) + script?.Remove(user) if(active_scripture) - active_scripture.end_invocation() + active_scripture?.end_invocation() if(buffer) buffer = null @@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(clockwork_slabs, list()) //Grant quickbound spells for(var/datum/action/innate/clockcult/quick_bind/script as anything in quick_bound_scriptures) - script.Grant(user) + script?.Grant(user) user.update_action_buttons() diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm b/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm index 12a456573e8e99..6626cd5c281a3c 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm @@ -157,7 +157,7 @@ item_type = /obj/item/ammo_box/advanced/s12gauge/antitide /datum/armament_entry/company_import/vitezstvi/shot_shells/confetti - item_type = /obj/item/ammo_box/advanced/s12gauge/honk + item_type = /obj/item/ammo_box/advanced/s12gauge/honkshot // Boxes of kiboko launcher ammo diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/masquerade_mask.dm b/modular_skyrat/modules/customization/modules/clothing/masks/masquerade_mask.dm new file mode 100644 index 00000000000000..45a63b861a9ceb --- /dev/null +++ b/modular_skyrat/modules/customization/modules/clothing/masks/masquerade_mask.dm @@ -0,0 +1,33 @@ + +/obj/item/clothing/mask/masquerade + name = "masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise!" + icon_state = "maskerade" + icon = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi' + worn_icon = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi' + flags_1 = IS_PLAYER_COLORABLE_1 + clothing_flags = MASKINTERNALS + alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER + supports_variations_flags = CLOTHING_SNOUTED_VARIATION | CLOTHING_SNOUTED_VOX_VARIATION | CLOTHING_SNOUTED_BETTER_VOX_VARIATION + greyscale_colors = "#ececec#333333#9b1e1e" + greyscale_config = /datum/greyscale_config/masquerade_mask + greyscale_config_worn = /datum/greyscale_config/masquerade_mask/worn + greyscale_config_worn_muzzled = /datum/greyscale_config/masquerade_mask/worn/snouted + greyscale_config_worn_better_vox = /datum/greyscale_config/masquerade_mask/worn/better_vox + greyscale_config_worn_vox = /datum/greyscale_config/masquerade_mask/worn/vox + greyscale_config_worn_teshari = /datum/greyscale_config/masquerade_mask/worn/teshari + +/obj/item/clothing/mask/masquerade/feathered + name = "feathered masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! This one even has a feather, to make it fancier!" + icon_state = "maskerade_feather" + +/obj/item/clothing/mask/masquerade/two_colors + name = "split masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors, to add to the confusion!" + icon_state = "maskerade_two_colors" + +/obj/item/clothing/mask/masquerade/two_colors/feathered + name = "feathered split masquerade mask" + desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors AND a feather, making it the most fancy masquerade mask yet!" + icon_state = "maskerade_two_colors_feather" diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index 532373f956729b..edb79554073a9d 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -193,7 +193,12 @@ emote_type = EMOTE_AUDIBLE mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) vary = TRUE - sound = 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg' + +/datum/emote/living/chitter/get_sound(mob/living/user) + if(ismoth(user)) + return 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg' + else + return'sound/creatures/chitter.ogg' /datum/emote/living/sigh/get_sound(mob/living/user) if(iscarbon(user)) diff --git a/modular_skyrat/modules/emotes/code/scream_datums.dm b/modular_skyrat/modules/emotes/code/scream_datums.dm index 8e75aa7f5569f2..8c1d32bdbe936c 100644 --- a/modular_skyrat/modules/emotes/code/scream_datums.dm +++ b/modular_skyrat/modules/emotes/code/scream_datums.dm @@ -58,6 +58,11 @@ GLOBAL_LIST_EMPTY(scream_types) male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_lizard.ogg') female_screamsounds = null +/datum/scream_type/cat + name = "Cat Scream" + male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg') + female_screamsounds = null + /datum/scream_type/moth name = "Moth Scream" male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg') diff --git a/modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg b/modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg index a9f3be40ddd845..ba00eec223c68c 100644 Binary files a/modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg and b/modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg differ diff --git a/modular_skyrat/modules/food_replicator/code/clothing.dm b/modular_skyrat/modules/food_replicator/code/clothing.dm index 8d1b6238ed6102..5e92b3fd3dc94c 100644 --- a/modular_skyrat/modules/food_replicator/code/clothing.dm +++ b/modular_skyrat/modules/food_replicator/code/clothing.dm @@ -37,6 +37,7 @@ worn_icon = 'modular_skyrat/modules/food_replicator/icons/clothing_worn.dmi' worn_icon_digi = 'modular_skyrat/modules/food_replicator/icons/clothing_digi.dmi' icon_state = "cloak_colonial" + allowed = /obj/item/clothing/suit/jacket/leather::allowed // these are special and can be worn in the suit slot, so we need this var to be defined /obj/item/clothing/neck/cloak/colonial/mob_can_equip(mob/living/equipper, slot, disable_warning, bypass_equip_delay_self, ignore_equipped, indirect_action) if(is_species(equipper, /datum/species/teshari)) diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm index d0052806a13de3..4d4074ccc66d75 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm @@ -87,6 +87,26 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask) // Ain't a damn thing +/* +* MASQUERADE MASKS +*/ + +/datum/loadout_item/mask/masquerade + name = "Masquerade Mask" + item_path = /obj/item/clothing/mask/masquerade + +/datum/loadout_item/mask/masquerade/two_colors + name = "Split Masquerade Mask" + item_path = /obj/item/clothing/mask/masquerade/two_colors + +/datum/loadout_item/mask/masquerade/feathered + name = "Feathered Masquerade Mask" + item_path = /obj/item/clothing/mask/masquerade/feathered + +/datum/loadout_item/mask/masquerade/two_colors/feathered + name = "Feathered Split Masquerade Mask" + item_path = /obj/item/clothing/mask/masquerade/two_colors/feathered + /* * FAMILIES */ diff --git a/modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm b/modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm index fb52206891e2fb..2fe351230644d5 100644 --- a/modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm +++ b/modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm @@ -37,9 +37,6 @@ /obj/item/gun/ballistic/automatic/pistol/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SCARBOROUGH) -/obj/item/gun/ballistic/automatic/pistol/m45a5/give_manufacturer_examine() - AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) - /obj/item/gun/ballistic/revolver/c38/detective/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) @@ -55,15 +52,9 @@ /obj/item/gun/ballistic/automatic/pistol/clandestine/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SCARBOROUGH) -/obj/item/gun/ballistic/automatic/pistol/pdh/pulse/give_manufacturer_examine() - return - /obj/item/gun/ballistic/automatic/l6_saw/toy/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_DONK) -/obj/item/gun/ballistic/automatic/cmg/give_manufacturer_examine() - AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) - /obj/item/gun/ballistic/revolver/mateba/give_manufacturer_examine() return diff --git a/modular_skyrat/modules/modular_vending/code/autodrobe.dm b/modular_skyrat/modules/modular_vending/code/autodrobe.dm index f1bc8940cbbed8..7511a7c39139fb 100644 --- a/modular_skyrat/modules/modular_vending/code/autodrobe.dm +++ b/modular_skyrat/modules/modular_vending/code/autodrobe.dm @@ -30,6 +30,10 @@ /obj/item/clothing/under/costume/skyrat/yukata = 5, /obj/item/clothing/under/costume/skyrat/kimono = 5, /obj/item/clothing/head/beret/badge = 5, + /obj/item/clothing/mask/masquerade = 5, + /obj/item/clothing/mask/masquerade/two_colors = 5, + /obj/item/clothing/mask/masquerade/feathered = 5, + /obj/item/clothing/mask/masquerade/two_colors/feathered = 5, ), ), list( diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm index b927e1cd38d987..22070f7b9ca984 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm @@ -1,7 +1,7 @@ // Low caliber grenade launcher (fun & games) /obj/item/gun/ballistic/automatic/sol_grenade_launcher - name = "\improper Carwo 'Kiboko' Grenade Launcher" + name = "\improper Kiboko Grenade Launcher" desc = "A unique grenade launcher firing .980 grenades. A laser sight system allows its user to specify a range for the grenades it fires to detonate at." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi' @@ -43,6 +43,10 @@ /obj/item/gun/ballistic/automatic/sol_grenade_launcher/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO) +/obj/item/gun/ballistic/automatic/sol_grenade_launcher/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/sol_grenade_launcher/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm index fbf5f38b6cfe30..f40fe03d45b330 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm @@ -2,7 +2,7 @@ /obj/item/gun/ballistic/automatic/sol_rifle name = "\improper Carwo-Cawil Battle Rifle" - desc = "A heavy battle rifle commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine." + desc = "A heavy battle rifle firing .40 Sol. Commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi' icon_state = "infanterie" @@ -54,6 +54,10 @@ /obj/item/gun/ballistic/automatic/sol_rifle/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO) +/obj/item/gun/ballistic/automatic/sol_rifle/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/sol_rifle/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/shotgun.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/shotgun.dm index af5f6131d887eb..2ba9ecb5fcb129 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/shotgun.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/shotgun.dm @@ -1,7 +1,7 @@ // SolFed shotgun (this was gonna be in a proprietary shotgun shell type outside of 12ga at some point, wild right?) /obj/item/gun/ballistic/shotgun/riot/sol - name = "\improper Carwo 'Renoster' Shotgun" + name = "\improper Renoster Shotgun" desc = "A twelve gauge shotgun with a six shell capacity underneath. Made for and used by SolFed's various military branches." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi' @@ -32,6 +32,10 @@ /obj/item/gun/ballistic/shotgun/riot/sol/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO) +/obj/item/gun/ballistic/shotgun/riot/sol/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/shotgun/riot/sol/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/submachinegun.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/submachinegun.dm index ab36648abe5740..4446ea84ef37df 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/submachinegun.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/submachinegun.dm @@ -1,8 +1,8 @@ // Base Sol SMG /obj/item/gun/ballistic/automatic/sol_smg - name = "\improper Carwo 'Sindano' Submachinegun" - desc = "A small submachinegun commonly seen in the hands of PMCs and other unsavory corpos. Accepts any standard Sol pistol magazine." + name = "\improper Sindano Submachine Gun" + desc = "A small submachine gun firing .35 Sol. Commonly seen in the hands of PMCs and other unsavory corpos. Accepts any standard Sol pistol magazine." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns32x.dmi' icon_state = "sindano" @@ -37,6 +37,10 @@ /obj/item/gun/ballistic/automatic/sol_smg/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO) +/obj/item/gun/ballistic/automatic/sol_smg/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/sol_smg/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm index c185834aea89d4..681702fcc7dca6 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm @@ -2,8 +2,10 @@ // Sprays a wall of plasma that sucks against armor but fucks against unarmored targets /obj/item/gun/ballistic/automatic/pistol/plasma_thrower - name = "\improper Szot 'Słońce' plasma projector" - desc = "An outdated sidearm rarely seen in use by some members of the CIN. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled." + name = "\improper Słońce Plasma Projector" + desc = "An outdated sidearm rarely seen in use by some members of the CIN. \ + Uses plasma power packs. \ + Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' icon_state = "slonce" @@ -28,6 +30,10 @@ /obj/item/gun/ballistic/automatic/pistol/plasma_thrower/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) +/obj/item/gun/ballistic/automatic/pistol/plasma_thrower/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/pistol/plasma_thrower/examine_more(mob/user) . = ..() @@ -48,8 +54,10 @@ // Shoots single, strong plasma blasts at a slow rate /obj/item/gun/ballistic/automatic/pistol/plasma_marksman - name = "\improper Szot 'Gwiazda' plasma sharpshooter" - desc = "An outdated sidearm rarely seen in use by some members of the CIN. Fires relatively accurate globs of searing plasma." + name = "\improper Gwiazda Plasma Sharpshooter" + desc = "An outdated sidearm rarely seen in use by some members of the CIN. \ + Uses plasma power packs. \ + Fires relatively accurate globs of searing plasma." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' icon_state = "gwiazda" @@ -72,6 +80,10 @@ /obj/item/gun/ballistic/automatic/pistol/plasma_marksman/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) +/obj/item/gun/ballistic/automatic/pistol/plasma_marksman/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/pistol/plasma_marksman/examine_more(mob/user) . = ..() @@ -89,7 +101,7 @@ // Woe, buckshot be upon ye /obj/item/gun/ballistic/revolver/shotgun_revolver - name = "\improper Szot 'Bóbr' 12 GA revolver" + name = "\improper Bóbr 12 GA revolver" desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a four shell cylinder. That's right, shell, this one shoots twelve guage." accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga recoil = SAWN_OFF_RECOIL diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm index f3b16e9ed513c1..2e906f2cbe3f2f 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/rifle.dm @@ -1,7 +1,7 @@ // Semi-automatic rifle firing .310 with reduced damage compared to a Sakhno /obj/item/gun/ballistic/automatic/lanca - name = "\improper Szot 'Lanca' Battle Rifle" + name = "\improper Lanca Battle Rifle" desc = "A relatively compact, long barreled bullpup battle rifle chambered for .310 Strilka. Has an integrated sight with \ a surprisingly functional amount of magnification, given its place of origin." @@ -50,6 +50,10 @@ /obj/item/gun/ballistic/automatic/lanca/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) +/obj/item/gun/ballistic/automatic/lanca/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/lanca/examine_more(mob/user) . = ..() @@ -73,7 +77,7 @@ // This sounds a lot scarier than it actually is, you'll just have to trust me here /obj/item/gun/ballistic/automatic/wylom - name = "\improper Szot 'Wyłom' AMR" + name = "\improper Wyłom Anti-Materiel Rifle" desc = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, \ the massively overperforming penetration of which being the reason this weapon was discontinued." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi' @@ -109,6 +113,10 @@ /obj/item/gun/ballistic/automatic/wylom/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) +/obj/item/gun/ballistic/automatic/wylom/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/wylom/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm index 116c47ab3dad05..8c0645a70454c6 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm @@ -1,8 +1,8 @@ // Rapid firing submachinegun firing .27-54 Cesarzowa /obj/item/gun/ballistic/automatic/miecz - name = "\improper Szot 'Miecz' Submachinegun" - desc = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber cartridges. \ + name = "\improper Miecz Submachine Gun" + desc = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber .27-54 cartridges. \ Due to the intended purpose of the weapon, and less than optimal ranged performance of the projectile, it has \ nothing more than basic glow-sights as opposed to the ranged scope Lanca users might be used to." @@ -44,6 +44,10 @@ /obj/item/gun/ballistic/automatic/miecz/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT) +/obj/item/gun/ballistic/automatic/miecz/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/miecz/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm index 1ae391325d0a0b..3db5e27198b670 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm @@ -1,8 +1,8 @@ // .35 Sol pistol /obj/item/gun/ballistic/automatic/pistol/sol - name = "\improper Trappiste 'Wespe' Pistol" - desc = "The standard issue service pistol of SolFed's various military branches. Comes with attached light." + name = "\improper Wespe Pistol" + desc = "The standard issue service pistol of SolFed's various military branches. Uses .35 Sol and comes with an attached light." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi' icon_state = "wespe" @@ -28,6 +28,10 @@ is_light_removable = FALSE, \ ) +/obj/item/gun/ballistic/automatic/pistol/sol/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/pistol/sol/examine_more(mob/user) . = ..() @@ -56,8 +60,9 @@ // Trappiste high caliber pistol in .585 /obj/item/gun/ballistic/automatic/pistol/trappiste - name = "\improper Trappiste 'Skild' Pistol" - desc = "A somewhat rare to see Trappiste pistol firing the high caliber .585 developed by the same company. Sees rare use mainly due to its tendency to cause severe wrist discomfort." + name = "\improper Skild Pistol" + desc = "A somewhat rare to see Trappiste pistol firing the high caliber .585 developed by the same company. \ + Sees rare use mainly due to its tendency to cause severe wrist discomfort." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi' icon_state = "skild" @@ -79,6 +84,10 @@ /obj/item/gun/ballistic/automatic/pistol/trappiste/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_TRAPPISTE) +/obj/item/gun/ballistic/automatic/pistol/sol/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/pistol/trappiste/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/revolver.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/revolver.dm index 22cbb471449abc..e3244e4234a959 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/revolver.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/revolver.dm @@ -1,7 +1,7 @@ // .35 Sol mini revolver /obj/item/gun/ballistic/revolver/sol - name = "\improper Trappiste 'Eland' Revolver" + name = "\improper Eland Revolver" desc = "A small revolver with a comically short barrel and cylinder space for eight .35 Sol Short rounds." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi' @@ -18,6 +18,10 @@ /obj/item/gun/ballistic/revolver/sol/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_TRAPPISTE) +/obj/item/gun/ballistic/revolver/sol/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/revolver/sol/examine_more(mob/user) . = ..() @@ -39,7 +43,7 @@ // .585 super revolver /obj/item/gun/ballistic/revolver/takbok - name = "\improper Trappiste 'Takbok' Revolver" + name = "\improper Takbok Revolver" desc = "A hefty revolver with an equally large cylinder capable of holding five .585 Trappiste rounds." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/trappiste_fabriek/guns32x.dmi' @@ -60,6 +64,10 @@ /obj/item/gun/ballistic/revolver/takbok/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_TRAPPISTE) +/obj/item/gun/ballistic/revolver/takbok/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/revolver/takbok/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm index ec586d0d35f68d..5ac6950ad660e5 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm @@ -3,12 +3,9 @@ */ /obj/item/gun/ballistic/rifle/boltaction/sporterized - name = "\improper Xhihao 'Rengo' precision rifle" - desc = "A Xhihao 'Rengo' conversion rifle. Came as parts sold in a single kit by Xhihao Light Arms, \ - which can be swapped out with many of the outdated or simply old parts on a typical Sakhno rifle. \ - While not necessarily increasing performance in any way, the magazine is slightly longer. The weapon \ - is also overall a bit shorter, making it easier to handle for some people. Cannot be sawn off, cutting \ - really any part of this weapon off would make it non-functional." + name = "\improper Rengo Precision Rifle" + desc = "A heavily modified Sakhno rifle, parts made by Xhihao light arms based around Jupiter herself. \ + Has a higher capacity than standard Sakhno rifles, fitting ten .310 cartridges." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns40x.dmi' icon_state = "rengo" worn_icon_state = "enchanted_rifle" // Not actually magical looking, just looks closest to this one @@ -25,6 +22,21 @@ /obj/item/gun/ballistic/rifle/boltaction/sporterized/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_XHIHAO) +/obj/item/gun/ballistic/rifle/boltaction/sporterized/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + +/obj/item/gun/ballistic/rifle/boltaction/sporterized/examine_more(mob/user) + . = ..() + + . += "The Xhihao 'Rengo' conversion rifle. Came as parts sold in a single kit by Xhihao Light Arms, \ + which can be swapped out with many of the outdated or simply old parts on a typical Sakhno rifle. \ + While not necessarily increasing performance in any way, the magazine is slightly longer. The weapon \ + is also overall a bit shorter, making it easier to handle for some people. Cannot be sawn off, cutting \ + really any part of this weapon off would make it non-functional." + + return . + /obj/item/gun/ballistic/rifle/boltaction/sporterized/empty bolt_locked = TRUE // so the bolt starts visibly open accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba/empty diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm index 8ef4e450ec9c39..29e5dbac767c0d 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm @@ -1,7 +1,7 @@ // Evil .585 smg that blueshields spawn with that will throw your screen like hell but itll sure kill whoever threatens a head really good /obj/item/gun/ballistic/automatic/xhihao_smg - name = "\improper Xhihao 'Bogseo' Submachinegun" + name = "\improper Bogseo Submachine Gun" desc = "A weapon that could hardly be called a 'sub' machinegun, firing the monstrous .585 cartridge. \ It provides enough kick to bruise a shoulder pretty bad if used without protection." @@ -43,6 +43,10 @@ AddElement(/datum/element/manufacturer_examine, COMPANY_XHIHAO) AddComponent(/datum/component/automatic_fire, fire_delay) +/obj/item/gun/ballistic/automatic/xhihao_smg/examine(mob/user) + . = ..() + . += span_notice("You can examine closer to learn a little more about this weapon.") + /obj/item/gun/ballistic/automatic/xhihao_smg/examine_more(mob/user) . = ..() diff --git a/modular_skyrat/modules/novaya_ert/code/police_outfit.dm b/modular_skyrat/modules/novaya_ert/code/police_outfit.dm index c34e390df578cd..4f5902eff9c433 100644 --- a/modular_skyrat/modules/novaya_ert/code/police_outfit.dm +++ b/modular_skyrat/modules/novaya_ert/code/police_outfit.dm @@ -14,6 +14,15 @@ desc = "A cloak made from heavy tarpaulin. Nigh wind- and waterproof thanks to its design. The signature white rectangle of the NRI police covers the garment's back." icon_state = "cloak_police" +// Just some extra police equipment +/obj/item/clothing/neck/cloak/colonial/nri_police/Initialize() + allowed += list( + /obj/item/restraints/handcuffs, + /obj/item/ammo_box, + /obj/item/ammo_casing, + ) + return ..() + /obj/item/clothing/head/hats/colonial/nri_police name = "imperial police cap" desc = "A puffy cap made out of tarpaulin covered by some textile. It is sturdy and comfortable, and seems to retain its form very well.
\ diff --git a/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm b/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm index c2d9877931344f..63011a1e6225c1 100644 --- a/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm +++ b/modular_skyrat/modules/shotgunrebalance/code/ammobox.dm @@ -77,9 +77,9 @@ ammo_type = /obj/item/ammo_casing/shotgun/incendiary max_ammo = 15 -/obj/item/ammo_box/advanced/s12gauge/honk - name = "Confetti ammo box" - desc = "A box of 35 shotgun shells. These ones contain harmless confetti, yippie!" +/obj/item/ammo_box/advanced/s12gauge/honkshot + name = "Confetti Honkshot ammo box" + desc = "A box of 35 shotgun shells." icon_state = "honk" - ammo_type = /obj/item/ammo_casing/shotgun/honk + ammo_type = /obj/item/ammo_casing/shotgun/honkshot max_ammo = 35 diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm index c1ad1e6c08280b..a4e237b0f11c1b 100644 --- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm +++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm @@ -255,35 +255,33 @@ /obj/projectile/bullet/pellet/shotgun_improvised weak_against_armour = TRUE // We will not have Improvised are Better 2.0 -/obj/item/ammo_casing/shotgun/honk +/obj/item/ammo_casing/shotgun/honkshot name = "confetti shell" - desc = "A 12 gauge buckshot shell thats been filled to the brim with confetti. Who is making all these?" + desc = "A 12 gauge buckshot shell thats been filled to the brim with confetti, yippie!" icon_state = "honkshell" - projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/honk + projectile_type = /obj/projectile/bullet/honkshot pellets = 12 variance = 35 fire_sound = 'sound/items/bikehorn.ogg' harmful = FALSE -/obj/projectile/bullet/pellet/shotgun_buckshot/honk +/obj/projectile/bullet/honkshot name = "confetti" damage = 0 - stamina = 1 - stamina_falloff_tile = 0 - wound_bonus = 0 - bare_wound_bonus = 0 + sharpness = NONE + shrapnel_type = NONE + impact_effect_type = null + ricochet_chance = 0 jitter = 1 SECONDS eyeblur = 1 SECONDS - sharpness = NONE hitsound = SFX_CLOWN_STEP - range = 12 + range = 4 icon_state = "guardian" - embedding = null -/obj/projectile/bullet/pellet/shotgun_buckshot/honk/Initialize(mapload) +/obj/projectile/bullet/honkshot/Initialize(mapload) . = ..() SpinAnimation() - range = rand(6, 12) + range = rand(1, 4) color = pick( COLOR_PRIDE_RED, COLOR_PRIDE_ORANGE, @@ -293,6 +291,19 @@ COLOR_PRIDE_PURPLE, ) -/obj/projectile/bullet/pellet/shotgun_buckshot/honk/on_range() +// This proc addition will spawn a decal on each tile the projectile travels over +/obj/projectile/bullet/honkshot/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) + new /obj/effect/decal/cleanable/confetti(get_turf(old_loc)) + return ..() + +// This proc addition will make living humanoids do a flip animation when hit by the projectile +/obj/projectile/bullet/honkshot/on_hit(atom/target, blocked, pierce_hit) + if(!isliving(target)) + return ..() + target.SpinAnimation(7,1) + return ..() + +// This proc addition adds a spark effect when the projectile expires/hits +/obj/projectile/bullet/honkshot/on_range() do_sparks(1, TRUE, src) - ..() + return ..() diff --git a/tgstation.dme b/tgstation.dme index 7a53e8eee22b9b..e2f6ce7587d9c6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6955,6 +6955,7 @@ #include "modular_skyrat\modules\customization\modules\clothing\masks\breath.dm" #include "modular_skyrat\modules\customization\modules\clothing\masks\gas_filter.dm" #include "modular_skyrat\modules\customization\modules\clothing\masks\gasmask.dm" +#include "modular_skyrat\modules\customization\modules\clothing\masks\masquerade_mask.dm" #include "modular_skyrat\modules\customization\modules\clothing\masks\paper.dm" #include "modular_skyrat\modules\customization\modules\clothing\neck\_neck.dm" #include "modular_skyrat\modules\customization\modules\clothing\neck\cloaks.dm" diff --git a/tgui/packages/tgui/interfaces/ClockworkSlab.jsx b/tgui/packages/tgui/interfaces/ClockworkSlab.jsx index 63649326f59a93..6e9eef57d8782e 100644 --- a/tgui/packages/tgui/interfaces/ClockworkSlab.jsx +++ b/tgui/packages/tgui/interfaces/ClockworkSlab.jsx @@ -1,8 +1,7 @@ // THIS IS A SKYRAT UI FILE import { Fragment } from 'react'; -import { useState } from 'react'; -import { useBackend } from '../backend'; +import { useBackend, useLocalState } from '../backend'; import { Box, Button, @@ -34,7 +33,10 @@ const convertPower = (power_in) => { }; export const ClockworkSlab = (props) => { - const [selectedTab, setSelectedTab] = useState('Servitude'); + const [selectedTab, setSelectedTab] = useLocalState( + 'selectedTab', + 'Servitude', + ); return ( @@ -334,19 +336,16 @@ const ClockworkOverviewStat = (props) => { }; const ClockworkButtonSelection = (props) => { - const [selectedTab, setSelectedTab] = useState({}); + const [selectedTab, setSelectedTab] = useLocalState('selectedTab', {}); const tabs = ['Servitude', 'Preservation', 'Structures']; return ( {tabs.map((tab) => ( - ))} diff --git a/tgui/packages/tgui/interfaces/NifPanel.jsx b/tgui/packages/tgui/interfaces/NifPanel.jsx index 28a90b41815528..7757fac70b0e39 100644 --- a/tgui/packages/tgui/interfaces/NifPanel.jsx +++ b/tgui/packages/tgui/interfaces/NifPanel.jsx @@ -1,5 +1,5 @@ -// THIS IS A SKYRAT UI FILE -import { useBackend, useLocalState } from '../backend'; +// THIS IS A SKYRAT SECTOR UI FILE +import { useBackend } from '../backend'; import { BlockQuote, Box, @@ -26,7 +26,7 @@ export const NifPanel = (props) => { max_power, current_theme, } = data; - const [settingsOpen, setSettingsOpen] = useLocalState('settingsOpen', false); + const [settingsOpen, setSettingsOpen] = useState(0); return (