fixed music, made peanut butter have collisionbox and made it look a …

…bit nicer

objects/obj_endlevel/Step_0.gml

@@ -2,6 +2,7 @@ if place_meeting(x,y,obj_player) && grabbed == false
 {
 	grabbed = true
 	obj_player.state = 1
+	obj_player.yspeed = 1
 	instance_create_depth(0,0,0,obj_fade)
 	alarm[0] = room_speed * 2.5
 }

objects/obj_music/Create_0.gml

@@ -1 +1 @@
-global.music = mus_menu
+global.music = audio_play_sound(mus_menu,1,false)

objects/obj_music/Other_4.gml

@@ -1,12 +1,15 @@
-audio_stop_sound(global.music)
+var mus = mus_nothing
 
 if room == menu
-	global.music = mus_menu
+	mus = mus_menu
 if room == plugs_1 or room == plugs_2 or room == plugs_3
-	global.music = mus_room1
+	mus = mus_room1
 if room == emptiness_and_ambience
-	global.music = mus_nothing
+	mus = mus_nothing
 
 
 
-audio_play_sound(global.music,5,true)
+if !audio_is_playing(mus) {
+	audio_stop_sound(global.music)
+	global.music = audio_play_sound(mus,1,true)
+}

objects/obj_ouchie/Create_0.gml

@@ -0,0 +1 @@
+depth = 1

objects/obj_ouchie/Step_0.gml

@@ -1,4 +1,4 @@
-if place_meeting(x,y,obj_player)
+if place_meeting(x,y,obj_player) and obj_player.state != 1
 {
 	audio_play_sound(sfx_hurt,0,false)
 	with obj_player

objects/obj_player/Create_0.gml

@@ -3,7 +3,6 @@ targetDoor = "A"
 canmove = true
 state = 0
 yspeed = 0
-
 /*
 State 0: Normal (Can move around)
 State 1: Pizza Time (Cannot interact with character)

objects/obj_player/Step_0.gml

@@ -11,7 +11,7 @@ if state == 1
 {
 	canmove = false
 	y += yspeed
-	yspeed += 0.3
+	yspeed -= 0.2
 }