diff --git a/GainStation13/sound/voice/Approaching.ogg b/GainStation13/sound/voice/Approaching.ogg new file mode 100644 index 0000000000..28c895cb3c Binary files /dev/null and b/GainStation13/sound/voice/Approaching.ogg differ diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index ba854e7ec2..5710a17c86 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -160,6 +160,7 @@ buildstacktype = null //Custom mats handle this /obj/structure/chair/wood + icon = 'GainStation13/icons/obj/chairs.dmi' icon_state = "wooden_chair" name = "wooden chair" desc = "Old is never too old to not be in fashion." @@ -539,6 +540,7 @@ /obj/item/chair/wood name = "wooden chair" + icon = 'GainStation13/icons/obj/chairs.dmi' icon_state = "wooden_chair_toppled" item_state = "woodenchair" resistance_flags = FLAMMABLE diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index b3811b8fef..569be84119 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -493,7 +493,7 @@ if(!arrivals_docked) var/atom/movable/screen/splash/Spl = new(character.client, TRUE) Spl.Fade(TRUE) - character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25) + character.playsound_local(get_turf(character), 'GainStation13/sound/voice/Approaching.ogg', 25) //GS13 - "now approaching, general station 13" job.standard_assign_skills(character.mind) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index ff4a7d2bba..85ae2b7440 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -66,7 +66,7 @@ if(mob_size == MOB_SIZE_LARGE) cuff_icon += "_[caste]" - dmi_file = 'icons/mob/alienqueen.dmi' + dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER) cuffs.color = handcuffed.color diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index a5ef90f283..ab09517feb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -1,6 +1,6 @@ /mob/living/carbon/alien/humanoid/royal //Common stuffs for Praetorian and Queen - icon = 'icons/mob/alienqueen.dmi' + icon = 'hyperstation/icons/mobs/alienqueen.dmi' status_flags = 0 unique_name = 0 pixel_x = -16 @@ -17,7 +17,7 @@ meleeSlashHumanPower = 30 meleeSlashSAPower = 60 - var/alt_inhands_file = 'icons/mob/alienqueen.dmi' + var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites /mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE) return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index a620c9a58b..5a93462e28 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -145,7 +145,7 @@ /mob/living/simple_animal/hostile/alien/queen/large name = "alien empress" - icon = 'icons/mob/alienqueen.dmi' + icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites icon_state = "alienq" icon_living = "alienq" icon_dead = "alienq_dead" diff --git a/hyperstation/icons/mobs/alienqueen.dmi b/hyperstation/icons/mobs/alienqueen.dmi new file mode 100644 index 0000000000..4c04e0e4bf Binary files /dev/null and b/hyperstation/icons/mobs/alienqueen.dmi differ