cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
This commit is contained in:
phil235
2016-02-10 22:35:19 +01:00
parent 83633edfed 58c91656a2
commit 0291f450d2
178 changed files with 3758 additions and 3113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/dental_implant.dm
+1 -1
View File
@@ -28,7 +28,7 @@
return 1
/datum/action/item_action/hands_free/activate_pill
name = "activate pill"
name = "Activate Pill"
/datum/action/item_action/hands_free/activate_pill/Trigger()
if(!..() || CheckRemoval(owner))