diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 4fc7562b3a..ad7ef288bc 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -65,7 +65,7 @@ use_power(5) icon_state = "doorctrl1" desiredstate = !desiredstate - trigger() + trigger(user) spawn(15) update_icon() diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index bd5cf7a056..d983f84914 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -38,7 +38,6 @@ bump_flag = MONKEY swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL push_flags = MONKEY|SLIME|SIMPLE_ANIMAL|ALIEN - var/holder_type = /obj/item/weapon/holder/monkey /datum/species/monkey/handle_npc(var/mob/living/carbon/human/H) if(H.stat != CONSCIOUS)