diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8ca5bd99612..68c82374d6c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -147,7 +147,7 @@ /datum/gear/uniform/pants display_name = "pants selection" path = /obj/item/clothing/under/pants - + /datum/gear/uniform/pants/New() ..() var/pants = list() @@ -162,9 +162,10 @@ pants["tan pants"] = /obj/item/clothing/under/pants/tan pants["khaki pants"] = /obj/item/clothing/under/pants/khaki pants["track pants"] = /obj/item/clothing/under/pants/track + pants["camo pants"] = /obj/item/clothing/under/pants/camo gear_tweaks += new/datum/gear_tweak/path(pants) - + /datum/gear/uniform/turtleneck - display_name = "tacticool turtleneck" + display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool - + diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index 97c76490e44..87d2e9a09a8 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -13,22 +13,22 @@ wizard_garb = 1 species_restricted = list("Human", "Machine", "Skeleton") - equipped(var/mob/user) - if(!(user.faction == "Space Wizard")) - var/mob/living/carbon/human/H = user - var/obj/item/organ/external/LH = H.get_organ("l_hand") - var/obj/item/organ/external/RH = H.get_organ("r_hand") - var/active_hand = H.hand - user << "Your hand passes through the [src] with a flash of searing heat!" - playsound(user, 'sound/effects/sparks4.ogg', 40, 1) - user.drop_item() - if(active_hand) - LH.droplimb(0,DROPLIMB_BURN) - else - RH.droplimb(0,DROPLIMB_BURN) - return +/obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user) + if(!user.is_wizard()) + var/mob/living/carbon/human/H = user + var/obj/item/organ/external/LH = H.get_organ("l_hand") + var/obj/item/organ/external/RH = H.get_organ("r_hand") + var/active_hand = H.hand + user << "Your hand passes through the [src] with a flash of searing heat!" + playsound(user, 'sound/effects/sparks4.ogg', 40, 1) + user.drop_item() + if(active_hand) + LH.droplimb(0,DROPLIMB_BURN) else - ..() + RH.droplimb(0,DROPLIMB_BURN) + return + else + ..() /obj/item/clothing/suit/space/void/wizard @@ -49,20 +49,20 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual) species_restricted = list("Human", "Skrell", "Machine", "Skeleton") - equipped(var/mob/user) - if(!(user.faction == "Space Wizard")) - var/mob/living/carbon/human/H = user - var/obj/item/organ/external/LH = H.get_organ("l_hand") - var/obj/item/organ/external/RH = H.get_organ("r_hand") - var/active_hand = H.hand - user << "Your hand passes through the [src] with a flash of searing heat!" - playsound(user, 'sound/effects/sparks4.ogg', 40, 1) - user.drop_item() - if(active_hand) - LH.droplimb(0,DROPLIMB_BURN) - else - RH.droplimb(0,DROPLIMB_BURN) - return +/obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user) + if(!user.is_wizard()) + var/mob/living/carbon/human/H = user + var/obj/item/organ/external/LH = H.get_organ("l_hand") + var/obj/item/organ/external/RH = H.get_organ("r_hand") + var/active_hand = H.hand + user << "Your hand passes through the [src] with a flash of searing heat!" + playsound(user, 'sound/effects/sparks4.ogg', 40, 1) + user.drop_item() + if(active_hand) + LH.droplimb(0,DROPLIMB_BURN) else - ..() + RH.droplimb(0,DROPLIMB_BURN) + return + else + ..() diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 72546649e1a..bbe1ff49b77 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -59,7 +59,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES body_parts_covered = HEAD|FACE|EYES siemens_coefficient = 0 - + tint = TINT_HEAVY //Changes by Nanako diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 45278232bd6..0e017866a33 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -39,7 +39,7 @@ item_state = "jeans" contained_sprite = 1 gender = PLURAL - body_parts_covered = LOWER_TORSO + body_parts_covered = LOWER_TORSO|LEGS /obj/item/clothing/under/pants/track name = "track pants" @@ -48,7 +48,7 @@ icon_state = "trackpants" item_state = "trackpants" contained_sprite = 1 - + /obj/item/clothing/under/pants/classic name = "classic jeans" desc = "A pair of classic jeans." @@ -60,49 +60,49 @@ desc = "Made in the finest space jeans factory this side of Tau Ceti." icon_state = "jeansmustang" item_state = "jeansmustang" - + /obj/item/clothing/under/pants/jeansblack name = "black jeans" desc = "A pair of black jeans." icon_state = "jeansblack" item_state = "jeansblack" - + /obj/item/clothing/under/pants/youngfolksjeans name = "young folks jeans" desc = "For those tired of boring old jeans." icon_state = "jeansyoungfolks" item_state = "jeansyoungfolks" - + /obj/item/clothing/under/pants/white name = "white pants" desc = "Plain boring white pants." icon_state = "whitepants" item_state = "whitepants" - + /obj/item/clothing/under/pants/black name = "black pants" desc = "A pair of plain black pants." icon_state = "blackpants" item_state = "blackpants" - + /obj/item/clothing/under/pants/red name = "red pants" desc = "Bright red pants." icon_state = "redpants" item_state = "redpants" - + /obj/item/clothing/under/pants/tan name = "tan pants" desc = "Some tan pants. You look like a white collar worker with these on." icon_state = "tanpants" item_state = "tanpants" - + /obj/item/clothing/under/pants/khaki name = "tan pants" desc = "A pair of dust beige khaki pants." icon_state = "khaki" item_state = "khaki" - + /obj/item/clothing/under/pants/camo name = "camouflage pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index f49f2a3ed96..b9e2413d892 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -1237,8 +1237,9 @@ var/list/total_extraction_beacons = list() 'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg') /obj/structure/punching_bag/attack_hand(mob/user as mob) - flick("[icon_state]2", src) - playsound(src.loc, pick(src.hit_sounds), 25, 1, -1) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + flick("[icon_state]2", src) + playsound(src.loc, pick(src.hit_sounds), 25, 1, -1) /obj/structure/weightlifter name = "Weight Machine" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d534ff12e05..2c144f74ed2 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -498,3 +498,6 @@ /mob/new_player/MayRespawn() return 1 + +/mob/new_player/show_message(msg, type, alt, alt_type) + return \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/mining.dm b/code/modules/projectiles/guns/energy/mining.dm index 07cdc34fe54..f6b910051c3 100644 --- a/code/modules/projectiles/guns/energy/mining.dm +++ b/code/modules/projectiles/guns/energy/mining.dm @@ -26,7 +26,7 @@ playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) user.visible_message( "\The [user] pumps \the [src]!", - "You pump \the [src]]!" + "You pump \the [src]!" ) power_supply.charge = power_supply.maxcharge diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 365c6010e3f..c534cc10afa 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -472,7 +472,7 @@ recharge_time = 1 charge_meter = 1 use_external_power = 1 - charge_cost = 200 + charge_cost = 25 /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill/special_check(var/mob/user) ..()