master cleanup

2017-06-05 22:50:31 -05:00
parent 26fbf3632d
commit 3d750adbd7
4 changed files with 0 additions and 41 deletions
@@ -1,12 +0,0 @@
-diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm	(rejected hunks)
-@@ -20207,9 +20151,7 @@
- /area/shuttle/syndicate)
- "aTq" = (
- /turf/closed/wall,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
-+/area/security/vacantoffice/a)
- "aTr" = (
- /obj/machinery/door/firedoor,
- /obj/machinery/status_display{
@@ -1,9 +0,0 @@
-diff a/code/game/atoms.dm b/code/game/atoms.dm	(rejected hunks)
-@@ -274,6 +274,7 @@
- 	return
- 
- /atom/proc/ex_act(severity, target)
-+	set waitfor = FALSE
- 	contents_explosion(severity, target)
- 
- /atom/proc/blob_act(obj/structure/blob/B)
@@ -1,7 +0,0 @@
-diff a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm	(rejected hunks)
-@@ -324,4 +324,4 @@
- 		/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
- 	)
- 	result = /obj/item/weapon/reagent_containers/food/snacks/branrequests
-	category = CAT_MISCFOOD
-+	subcategory = CAT_MISCFOOD