diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 7d924bb3eff4..f045f55e7f7e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1046,6 +1046,31 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9") w_class = W_CLASS_SMALL flags = FPRINT + +/obj/item/gta_jetpack + name = "jetpack" + desc = "ROCKETMAN" + icon = 'icons/obj/weapons.dmi' + inhand_states = list("left_hand" = 'icons/mob/in-hand/left/misc_tools.dmi', "right_hand" = 'icons/mob/in-hand/right/misc_tools.dmi') + icon_state = "jetpack" + item_state = "jetpack" + w_class = W_CLASS_HUGE + +/obj/item/gta_jetpack/pickup(var/mob/user) + ..() + playsound(src, 'sound/items/GTA_UI.ogg', 100, 0, null, FALLOFF_SOUNDS, 0) + user.flying = 1 + animate(user, pixel_y = pixel_y + 10 * PIXEL_MULTIPLIER , time = 10, loop = 1, easing = SINE_EASING) + +/obj/item/gta_jetpack/dropped(var/mob/user) + ..() + user.flying = 0 + animate(user, pixel_y = pixel_y + 10 * PIXEL_MULTIPLIER , time = 1, loop = 1) + animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING) + animate(user) + if(user.lying)//aka. if they have just been stunned + user.pixel_y -= 6 * PIXEL_MULTIPLIER + /obj/item/weapon/wire desc = "This is just a simple piece of regular insulated wire." name = "wire" diff --git a/icons/mob/in-hand/left/misc_tools.dmi b/icons/mob/in-hand/left/misc_tools.dmi index 4e64c6c3ac8c..0c304628ec2f 100644 Binary files a/icons/mob/in-hand/left/misc_tools.dmi and b/icons/mob/in-hand/left/misc_tools.dmi differ diff --git a/icons/mob/in-hand/right/misc_tools.dmi b/icons/mob/in-hand/right/misc_tools.dmi index bc0fede7cac9..b9027bc15450 100644 Binary files a/icons/mob/in-hand/right/misc_tools.dmi and b/icons/mob/in-hand/right/misc_tools.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 5c739ab80895..ac9f9aba9bed 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/sound/items/GTA_UI.ogg b/sound/items/GTA_UI.ogg new file mode 100644 index 000000000000..0eb82596a81e Binary files /dev/null and b/sound/items/GTA_UI.ogg differ