cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
This commit is contained in:
phil235
2016-04-26 21:49:51 +02:00
committed by phil235
parent b7da04e8c8 2bc85f6e9e
commit 6eb4ffa825
85 changed files with 1093 additions and 5082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/bedsheet_bin.dm
View File

@@ -19,6 +19,7 @@ LINEN BINS
item_color = "white"
burn_state = FLAMMABLE
dog_fashion = /datum/dog_fashion/head/ghost
/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))