cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	maps/exodus-1.dmm
This commit is contained in:
Zuhayr
2015-09-01 10:47:12 +09:30
parent deb29c177d 4b94fd42bc
commit 7581717246
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/door_control.dm
View File

@@ -65,7 +65,7 @@
use_power(5) use_power(5)
icon_state = "doorctrl1" icon_state = "doorctrl1"
desiredstate = !desiredstate desiredstate = !desiredstate
trigger() trigger(user)
spawn(15) spawn(15)
update_icon() update_icon()

1
code/modules/mob/living/carbon/human/species/station/monkey.dm
View File

@@ -38,7 +38,6 @@
bump_flag = MONKEY bump_flag = MONKEY
swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL
push_flags = MONKEY|SLIME|SIMPLE_ANIMAL|ALIEN 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) /datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS) if(H.stat != CONSCIOUS)